[arch-commits] Commit in python-distribute/trunk (4 files)
Stéphane Gaudreault
stephane at archlinux.org
Mon Mar 28 09:09:47 UTC 2011
Date: Monday, March 28, 2011 @ 05:09:47
Author: stephane
Revision: 117042
upgpkg: python-distribute 0.6.15-1
version bump, same PKGBUILD for python2 and python3
Added:
python-distribute/trunk/distribute-python2_and_3.patch
(from rev 117040, python-distribute/trunk/distribute-0.6.14_python2_and_3.patch)
Modified:
python-distribute/trunk/PKGBUILD
Deleted:
python-distribute/trunk/distribute-0.6.14-python32.patch
python-distribute/trunk/distribute-0.6.14_python2_and_3.patch
---------------------------------------+
PKGBUILD | 47 ++++++++++++++++++-----------
distribute-0.6.14-python32.patch | 16 ----------
distribute-0.6.14_python2_and_3.patch | 51 --------------------------------
distribute-python2_and_3.patch | 51 ++++++++++++++++++++++++++++++++
4 files changed, 81 insertions(+), 84 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-28 09:07:26 UTC (rev 117041)
+++ PKGBUILD 2011-03-28 09:09:47 UTC (rev 117042)
@@ -1,33 +1,46 @@
# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
# Contributor: Sebastien Binet <binet at farnsworth>
-pkgname=python-distribute
-pkgver=0.6.14
-pkgrel=7
+pkgbase=python-distribute
+pkgname=('python-distribute' 'python2-distribute')
+pkgver=0.6.15
+pkgrel=1
pkgdesc="Easily build and distribute Python packages"
arch=('any')
license=('PSF')
-url="http://packages.python.org/distribute"
-depends=('python')
+url="http://pypi.python.org/pypi/distribute"
+makedepends=('python' 'python2')
source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
- distribute-${pkgver}_python2_and_3.patch
- distribute-0.6.14-python32.patch)
-sha1sums=('6bea50b97f36bf751548bb486a534204a690aa4d'
- 'de635febfb11dc6878e5bdbac4a0e1d539c19d79'
- '725c4a1933e6689e38d200451caf2dae73d758ef')
+ distribute-python2_and_3.patch)
+sha1sums=('af088df456ea6b25c0e23647648fd317ed6e0d1b'
+ 'de635febfb11dc6878e5bdbac4a0e1d539c19d79')
build() {
- cd "${srcdir}/distribute-${pkgver}"
- patch -Np1 -i ../distribute-${pkgver}_python2_and_3.patch
+ cd "${srcdir}"
+ cp -a distribute-${pkgver}{,-python2}
- # Fix for easy_install unittests on python-3.2
- patch -Np1 -i ../distribute-0.6.14-python32.patch
-
+ # Build python 3 module
+ cd distribute-${pkgver}
+ patch -Np1 -i ../distribute-python2_and_3.patch
python setup.py build
-
python setup.py test
+
+ # Build python 2 module
+ cd ../distribute-${pkgver}-python2
+ patch -Np1 -i ../distribute-python2_and_3.patch
+ python2 setup.py build
+ python2 setup.py test
}
-package() {
+package_python-distribute() {
+ depends=('python>=3.2')
+
cd "${srcdir}/distribute-${pkgver}"
python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
}
+
+package_python2-distribute() {
+ depends=('python2>=2.7')
+
+ cd "${srcdir}/distribute-${pkgver}-python2"
+ python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+}
Deleted: distribute-0.6.14-python32.patch
===================================================================
--- distribute-0.6.14-python32.patch 2011-03-28 09:07:26 UTC (rev 117041)
+++ distribute-0.6.14-python32.patch 2011-03-28 09:09:47 UTC (rev 117042)
@@ -1,16 +0,0 @@
-diff -r 5bc94690ee6c -r f64c2d57df43 setuptools/command/easy_install.py
---- a/setuptools/command/easy_install.py Sat Nov 06 15:01:33 2010 +0100
-+++ b/setuptools/command/easy_install.py Tue Feb 22 12:05:49 2011 -0800
-@@ -204,6 +204,12 @@
- 'exec_prefix': exec_prefix,
- }
-
-+ try:
-+ self.config_vars['abiflags'] = sys.abiflags
-+ except AttributeError:
-+ # Only python-3.2+ has sys.abiflags
-+ self.config_vars['abiflags'] = ''
-+
- if HAS_USER_SITE:
- self.config_vars['userbase'] = self.install_userbase
- self.config_vars['usersite'] = self.install_usersite
Deleted: distribute-0.6.14_python2_and_3.patch
===================================================================
--- distribute-0.6.14_python2_and_3.patch 2011-03-28 09:07:26 UTC (rev 117041)
+++ distribute-0.6.14_python2_and_3.patch 2011-03-28 09:09:47 UTC (rev 117042)
@@ -1,51 +0,0 @@
-diff -Naur distribute-0.6.14.ori//distribute.egg-info/entry_points.txt distribute-0.6.14/distribute.egg-info/entry_points.txt
---- distribute-0.6.14.ori//distribute.egg-info/entry_points.txt 2010-07-14 20:14:10.000000000 -0400
-+++ distribute-0.6.14/distribute.egg-info/entry_points.txt 2010-10-21 09:26:43.386667396 -0400
-@@ -31,7 +31,8 @@
- depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
- [console_scripts]
--easy_install = setuptools.command.easy_install:main
-+easy_install-3.1 = setuptools.command.easy_install:main
-+easy_install-2.7 = setuptools.command.easy_install:main
- easy_install-2.6 = setuptools.command.easy_install:main
-
- [setuptools.file_finders]
-diff -Naur distribute-0.6.14.ori//distribute_setup.py distribute-0.6.14/distribute_setup.py
---- distribute-0.6.14.ori//distribute_setup.py 2010-07-14 19:53:38.000000000 -0400
-+++ distribute-0.6.14/distribute_setup.py 2010-10-21 09:25:18.356667404 -0400
-@@ -299,8 +299,7 @@
- log.warn('Could not find the install location')
- return
- pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
-- setuptools_file = 'setuptools-%s-py%s.egg-info' % \
-- (SETUPTOOLS_FAKED_VERSION, pyver)
-+ setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
- pkg_info = os.path.join(placeholder, setuptools_file)
- if os.path.exists(pkg_info):
- log.warn('%s already exists', pkg_info)
-diff -Naur distribute-0.6.14.ori//setup.py distribute-0.6.14/setup.py
---- distribute-0.6.14.ori//setup.py 2010-07-14 19:53:38.000000000 -0400
-+++ distribute-0.6.14/setup.py 2010-10-21 09:32:44.850000736 -0400
-@@ -96,6 +96,8 @@
- f.close()
-
-
-+console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
-+
- # if we are installing Distribute using "python setup.py install"
- # we need to get setuptools out of the way
- def _easy_install_marker():
-@@ -182,11 +184,7 @@
- "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
- ],
-
-- "console_scripts": [
-- "easy_install = setuptools.command.easy_install:main",
-- "easy_install-%s = setuptools.command.easy_install:main"
-- % sys.version[:3]
-- ],
-+ "console_scripts": console_scripts,
-
- "setuptools.file_finders":
- ["svn_cvs = setuptools.command.sdist:_default_revctrl"],
Copied: python-distribute/trunk/distribute-python2_and_3.patch (from rev 117040, python-distribute/trunk/distribute-0.6.14_python2_and_3.patch)
===================================================================
--- distribute-python2_and_3.patch (rev 0)
+++ distribute-python2_and_3.patch 2011-03-28 09:09:47 UTC (rev 117042)
@@ -0,0 +1,51 @@
+diff -Naur distribute-0.6.14.ori//distribute.egg-info/entry_points.txt distribute-0.6.14/distribute.egg-info/entry_points.txt
+--- distribute-0.6.14.ori//distribute.egg-info/entry_points.txt 2010-07-14 20:14:10.000000000 -0400
++++ distribute-0.6.14/distribute.egg-info/entry_points.txt 2010-10-21 09:26:43.386667396 -0400
+@@ -31,7 +31,8 @@
+ depends.txt = setuptools.command.egg_info:warn_depends_obsolete
+
+ [console_scripts]
+-easy_install = setuptools.command.easy_install:main
++easy_install-3.1 = setuptools.command.easy_install:main
++easy_install-2.7 = setuptools.command.easy_install:main
+ easy_install-2.6 = setuptools.command.easy_install:main
+
+ [setuptools.file_finders]
+diff -Naur distribute-0.6.14.ori//distribute_setup.py distribute-0.6.14/distribute_setup.py
+--- distribute-0.6.14.ori//distribute_setup.py 2010-07-14 19:53:38.000000000 -0400
++++ distribute-0.6.14/distribute_setup.py 2010-10-21 09:25:18.356667404 -0400
+@@ -299,8 +299,7 @@
+ log.warn('Could not find the install location')
+ return
+ pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+- setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+- (SETUPTOOLS_FAKED_VERSION, pyver)
++ setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
+ pkg_info = os.path.join(placeholder, setuptools_file)
+ if os.path.exists(pkg_info):
+ log.warn('%s already exists', pkg_info)
+diff -Naur distribute-0.6.14.ori//setup.py distribute-0.6.14/setup.py
+--- distribute-0.6.14.ori//setup.py 2010-07-14 19:53:38.000000000 -0400
++++ distribute-0.6.14/setup.py 2010-10-21 09:32:44.850000736 -0400
+@@ -96,6 +96,8 @@
+ f.close()
+
+
++console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
++
+ # if we are installing Distribute using "python setup.py install"
+ # we need to get setuptools out of the way
+ def _easy_install_marker():
+@@ -182,11 +184,7 @@
+ "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
+ ],
+
+- "console_scripts": [
+- "easy_install = setuptools.command.easy_install:main",
+- "easy_install-%s = setuptools.command.easy_install:main"
+- % sys.version[:3]
+- ],
++ "console_scripts": console_scripts,
+
+ "setuptools.file_finders":
+ ["svn_cvs = setuptools.command.sdist:_default_revctrl"],
More information about the arch-commits
mailing list