Merge remote-tracking branch 'x/master'
* x/master: python-distribute: add missing patch. python-distribute: update to 0.6.28.
This commit is contained in:
davehome
commit
c2dde6da5b
|
|
@ -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"],
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
--- distribute.egg-info/entry_points.txt 2012-05-18 15:46:04.000000000 -0400
|
||||
+++ distribute.egg-info/entry_points.txt 2012-05-22 18:14:17.443383039 -0400
|
||||
@@ -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
|
||||
install_scripts = setuptools.command.install_scripts:install_scripts
|
||||
bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
|
||||
bdist_egg = setuptools.command.bdist_egg:bdist_egg
|
||||
--- distribute_setup.py 2012-05-18 15:45:03.000000000 -0400
|
||||
+++ distribute_setup.py 2012-05-22 18:14:17.443383039 -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)
|
||||
--- setup.py 2012-05-18 15:19:51.000000000 -0400
|
||||
+++ setup.py 2012-05-22 18:14:17.443383039 -0400
|
||||
@@ -100,6 +100,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
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
# Template file for 'python-distribute'
|
||||
pkgname=python-distribute
|
||||
version=0.6.14
|
||||
version=0.6.28
|
||||
revision=1
|
||||
wrksrc="distribute-${version}"
|
||||
patch_args="-Np1"
|
||||
distfiles="http://pypi.python.org/packages/source/d/distribute/distribute-$version.tar.gz"
|
||||
build_style=python-module
|
||||
fulldepends="python"
|
||||
short_desc="A collection of extensions to the Python distutils"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
checksum=44c92b7edbc0ff9cd5847291e7dcb4cc75e24247a306bd4b8a139abd355b0db0
|
||||
homepage="http://pypi.python.org/pypi/distribute"
|
||||
license="PSF"
|
||||
distfiles="http://pypi.python.org/packages/source/d/distribute/distribute-$version.tar.gz"
|
||||
checksum=a42e897551aeb7600708f4aa6a0c02acb4458613976234b7d4fad7ae841a8d63
|
||||
long_desc="
|
||||
Extensions to the python-distutils for large or complex distributions."
|
||||
|
||||
pycompile_module="setuptools pkg_resources easy_install site"
|
||||
pycompile_module="pkg_resources.py easy_install.py site.py setuptools"
|
||||
noarch=yes
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue