Attachment 602173 Details for Bug 845650 – Use distutils instead of paver

[patch] Use distutils instead of paver

0001-Migrate-build-from-paver-to-distutils-based-setup.py.patch (text/plain), 4.69 KB, created by Toshio Ernie Kuratomi on 2012-08-03 18:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Toshio Ernie Kuratomi

Created: 2012-08-03 18:10:27 UTC

Size: 4.69 KB

patch

obsolete

>From f54bbe30813b3bb153b1162fef8fcf2fc58274b8 Mon Sep 17 00:00:00 2001
>From: Toshio Kuratomi <toshio@fedoraproject.org>
>Date: Fri, 3 Aug 2012 10:56:31 -0700
>Subject: [PATCH] Migrate build from paver to distutils based setup.py and
> remove PyXML references (not really a dep)>
>
>---
> INSTALL                    |    4 ++--
> MANIFEST.in                |    2 +-
> fedora-business-cards.spec |   11 +++++------
> pavement.py                |   40 ----------------------------------------
> setup.py                   |   15 +++++++++++++++
> 5 files changed, 23 insertions(+), 49 deletions(-)
> delete mode 100644 pavement.py
> create mode 100644 setup.py
>
>diff --git a/INSTALL b/INSTALL
>index 5281659..2611908 100644
>--- a/INSTALL
>+++ b/INSTALL
>@@ -1,7 +1,7 @@
> Make sure you have the following packages from yum:
>-  aajohan-comfortaa-fonts abattis-cantarell-fonts inkscape PyXML python-fedora python-paver
>+  aajohan-comfortaa-fonts abattis-cantarell-fonts inkscape python-fedora
> 
> Then run:
>-  paver install install_executable
>+  python setup.py install
> 
> Done!
>diff --git a/MANIFEST.in b/MANIFEST.in
>index 07d60d0..97b1c4d 100644
>--- a/MANIFEST.in
>+++ b/MANIFEST.in
>@@ -1 +1 @@
>-include pavement.py COPYING INSTALL fedora-business-cards
>+include COPYING INSTALL fedora-business-cards fedora-business-cards.spec
>diff --git a/fedora-business-cards.spec b/fedora-business-cards.spec
>index 100ef70..5804195 100644
>--- a/fedora-business-cards.spec
>+++ b/fedora-business-cards.spec
>@@ -10,8 +10,8 @@ Source0:        http://ianweller.fedorapeople.org/releases/%{name}/%{name}-%{ver
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildArch:      noarch
>-BuildRequires:  python-devel python-paver python-setuptools python-iniparse
>-Requires:       PyXML python-fedora ghostscript inkscape aajohan-comfortaa-fonts abattis-cantarell-fonts
>+BuildRequires:  python2-devel python-iniparse
>+Requires:       python-fedora ghostscript inkscape aajohan-comfortaa-fonts abattis-cantarell-fonts
> Requires:       fedora-logos > 14.0.2-1
> 
> 
>@@ -25,14 +25,12 @@ for Fedora Project contributors.
> 
> 
> %build
>-paver build
>+python setup.py build
> 
> 
> %install
> rm -rf %{buildroot}
>-paver install --skip-build --root %{buildroot}
>-paver install_executable --root %{buildroot}
>-
>+python setup.py install --skip-build --root %{buildroot}
> 
> %clean
> rm -rf %{buildroot}
>@@ -52,6 +50,7 @@ rm -rf %{buildroot}
> - Cards now use Cantarell and Comfortaa (RHBZ #700397)
> - Removes Fedora Talk number (RHBZ #703202)
> - Applies Unicode patch from Arturo Fernandez (RHBZ #557001)
>+- Building now uses distutils
> 
> * Tue Nov 30 2010 Ian Weller <ian@ianweller.org> - 0.2.4.3-1
> - Add template for the Europe business card size
>diff --git a/pavement.py b/pavement.py
>deleted file mode 100644
>index c899330..0000000
>--- a/pavement.py
>+++ /dev/null
>@@ -1,40 +0,0 @@
>-import os
>-import paver.path
>-from paver.easy import *
>-import paver.setuputils
>-
>-paver.setuputils.install_distutils_tasks()
>-
>-options(
>-    setup=Bunch(
>-        name="fedora-business-cards",
>-        version="0.3",
>-        description="A generator for Fedora contributor business cards",
>-        packages=["fedora_business_cards",
>-                  "fedora_business_cards.frontend",
>-                  "fedora_business_cards.generators"],
>-        author="Ian Weller",
>-        author_email="iweller@redhat.com",
>-        license="GPLv2+",
>-        url="https://fedoraproject.org/wiki/Business_cards"
>-    ),
>-    install_executable=Bunch(
>-        bin_dir="/usr/bin"
>-    )
>-)
>-
>-@task
>-@cmdopts([('root=', None, 'install everything relative to this alternative root'
>-           ' directory')])
>-def install_executable():
>-    """install executable for generator"""
>-    options.order("install_executable", add_rest=True)
>-    try:
>-        root_dir = options.root
>-    except AttributeError:
>-        root_dir = ''
>-    bin_dir = paver.path.path(root_dir + options.bin_dir)
>-    if not os.path.exists(bin_dir):
>-        bin_dir.makedirs(0755)
>-    command = "install -cpm 755 %s %s" % ("fedora-business-cards", bin_dir)
>-    dry(command, sh, command)
>diff --git a/setup.py b/setup.py
>new file mode 100644
>index 0000000..2bb9e5b
>--- /dev/null
>+++ b/setup.py
>@@ -0,0 +1,15 @@
>+from distutils.core import setup
>+
>+setup (
>+        name="fedora-business-cards",
>+        version="0.3",
>+        description="A generator for Fedora contributor business cards",
>+        packages=["fedora_business_cards",
>+                  "fedora_business_cards.frontend",
>+                  "fedora_business_cards.generators"],
>+        author="Ian Weller",
>+        author_email="iweller@redhat.com",
>+        license="GPLv2+",
>+        url="https://fedoraproject.org/wiki/Business_cards",
>+        scripts=['fedora-business-cards'],
>+)
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 845650: 602173