[arch-commits] Commit in python-distribute/trunk (2 files)

Stéphane Gaudreault stephane at archlinux.org
Thu Nov 17 03:09:00 UTC 2011


    Date: Wednesday, November 16, 2011 @ 22:08:59
  Author: stephane
Revision: 142851

upgpkg: python-distribute 0.6.24-1

upstream update

Modified:
  python-distribute/trunk/PKGBUILD
  python-distribute/trunk/distribute-python2_and_3.patch

--------------------------------+
 PKGBUILD                       |    9 +++++---
 distribute-python2_and_3.patch |   42 ++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-17 01:39:31 UTC (rev 142850)
+++ PKGBUILD	2011-11-17 03:08:59 UTC (rev 142851)
@@ -3,7 +3,7 @@
 # Contributor: Sebastien Binet <binet at farnsworth>
 pkgbase=python-distribute
 pkgname=('python-distribute' 'python2-distribute')
-pkgver=0.6.21
+pkgver=0.6.24
 pkgrel=1
 pkgdesc="Easily build and distribute Python packages"
 arch=('any')
@@ -12,8 +12,8 @@
 makedepends=('python' 'python2')
 source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
         distribute-python2_and_3.patch)
-sha1sums=('4bc3df524ba1d684ba997caab3346040551a3820'
-          '19a78b79123095dc4a99cda4ba0d02e34210c310')
+sha1sums=('0670bdbba2be6892f67a6f946259776fa8331525'
+          '479a239fae1047fa4a8c64b89f4aec2934f027b9')
 
 build() {
    cd "${srcdir}"
@@ -31,6 +31,9 @@
 
    # Build python 2 module
    cd ../distribute-${pkgver}-python2
+
+   sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py
+
    python2 setup.py build
    python2 setup.py test
 }

Modified: distribute-python2_and_3.patch
===================================================================
--- distribute-python2_and_3.patch	2011-11-17 01:39:31 UTC (rev 142850)
+++ distribute-python2_and_3.patch	2011-11-17 03:08:59 UTC (rev 142851)
@@ -1,19 +1,18 @@
-diff -Naur distribute-0.6.19.ori//distribute.egg-info/entry_points.txt distribute-0.6.19/distribute.egg-info/entry_points.txt
---- distribute-0.6.19.ori//distribute.egg-info/entry_points.txt	2011-06-01 20:10:28.000000000 -0400
-+++ distribute-0.6.19/distribute.egg-info/entry_points.txt	2011-06-20 06:34:22.599954085 -0400
-@@ -32,7 +32,8 @@
- 
- [console_scripts]
- easy_install = setuptools.command.easy_install:main
--easy_install-2.6 = setuptools.command.easy_install:main
+diff -Naur distribute-0.6.24.ori/distribute.egg-info/entry_points.txt distribute-0.6.24/distribute.egg-info/entry_points.txt
+--- distribute-0.6.24.ori/distribute.egg-info/entry_points.txt	2011-10-16 09:09:39.000000000 -0400
++++ distribute-0.6.24/distribute.egg-info/entry_points.txt	2011-11-16 21:40:38.410170855 -0500
+@@ -11,6 +11,8 @@
+ install_egg_info = setuptools.command.install_egg_info:install_egg_info
+ alias = setuptools.command.alias:alias
+ easy_install = setuptools.command.easy_install:easy_install
 +easy_install-2.7 = setuptools.command.easy_install:main
-+easy_install-3.2 = setuptools.command.easy_install:main
- 
- [setuptools.file_finders]
- svn_cvs = setuptools.command.sdist:_default_revctrl
-diff -Naur distribute-0.6.19.ori//distribute_setup.py distribute-0.6.19/distribute_setup.py
---- distribute-0.6.19.ori//distribute_setup.py	2011-06-01 06:24:15.000000000 -0400
-+++ distribute-0.6.19/distribute_setup.py	2011-06-20 06:35:31.729951812 -0400
++easy_install-3.2 = setuptools.command.easy_install:main  
+ install_scripts = setuptools.command.install_scripts:install_scripts
+ bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+ bdist_egg = setuptools.command.bdist_egg:bdist_egg
+diff -Naur distribute-0.6.24.ori/distribute_setup.py distribute-0.6.24/distribute_setup.py
+--- distribute-0.6.24.ori/distribute_setup.py	2011-10-16 09:05:57.000000000 -0400
++++ distribute-0.6.24/distribute_setup.py	2011-11-16 21:41:55.990174043 -0500
 @@ -299,8 +299,7 @@
          log.warn('Could not find the install location')
          return
@@ -24,15 +23,14 @@
      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.19.ori//setup.py distribute-0.6.19/setup.py
---- distribute-0.6.19.ori//setup.py	2011-06-01 06:23:28.000000000 -0400
-+++ distribute-0.6.19/setup.py	2011-06-20 06:37:05.806615385 -0400
-@@ -100,6 +100,8 @@
+diff -Naur distribute-0.6.24.ori/setup.py distribute-0.6.24/setup.py
+--- distribute-0.6.24.ori/setup.py	2011-10-16 09:05:57.000000000 -0400
++++ distribute-0.6.24/setup.py	2011-11-16 21:42:52.496843023 -0500
+@@ -99,6 +99,7 @@
+             finally:
                  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():




More information about the arch-commits mailing list