factory sync
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=22
This commit is contained in:
parent
a9b47a1e82
commit
938b91f3ba
8
python-setuptools-distutils-log.diff
Normal file
8
python-setuptools-distutils-log.diff
Normal file
@ -0,0 +1,8 @@
|
||||
diff -Naur ../setuptools-0.6c8.orig/setuptools/command/sdist.py ./setuptools/command/sdist.py
|
||||
--- ../setuptools-0.6c8.orig/setuptools/command/sdist.py 2006-10-31 18:20:42.000000000 +0100
|
||||
+++ ./setuptools/command/sdist.py 2008-10-22 11:51:54.000000000 +0200
|
||||
@@ -1,3 +1,4 @@
|
||||
+from distutils import log
|
||||
from distutils.command.sdist import sdist as _sdist
|
||||
from distutils.util import convert_path
|
||||
import os, re, sys, pkg_resources
|
@ -1,8 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 15 01:49:17 AST 2008 - jfunk@funktronics.ca
|
||||
Mon Mar 30 13:51:48 CEST 2009 - matejcik@suse.cz
|
||||
|
||||
- Update to 0.6c9
|
||||
- update to 0.6c9
|
||||
* python 2.6 compatibility fixes
|
||||
- added patch to create install path if it doesn't exist
|
||||
- removed python-devel from requires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 22 12:09:27 CEST 2008 - skh@suse.de
|
||||
|
||||
- add python-setuptools-distutils-log.diff:
|
||||
setuptools/command/sdist.py: import distutils.log [bnc#428177]
|
||||
- add python-setuptools-svn15.diff:
|
||||
setuptools/command/egg_info.py: recognize svn format version 1.5 magic
|
||||
number [also bnc#428177]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 18 18:13:45 CEST 2008 - cthiel@suse.de
|
||||
|
@ -19,9 +19,9 @@
|
||||
|
||||
|
||||
Name: python-setuptools
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: fdupes python-base
|
||||
Version: 0.6c9
|
||||
Release: 1
|
||||
Release: 10
|
||||
Summary: Download, build, install, upgrade, and uninstall Python packages -- easily!
|
||||
Group: Development/Libraries/Python
|
||||
License: Other uncritical OpenSource License; Python Copyright
|
||||
@ -29,8 +29,9 @@ Url: http://cheeseshop.python.org/pypi/setuptools
|
||||
Source: setuptools-%{version}.tar.bz2
|
||||
Source1: psfl.txt
|
||||
Source2: zpl.txt
|
||||
Patch1: python-setuptools-distutils-log.diff
|
||||
Patch2: setuptools-0.6c9-create-sitedir.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires: python-devel
|
||||
%py_requires
|
||||
|
||||
%description
|
||||
@ -46,6 +47,8 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q -n setuptools-%{version}
|
||||
%patch1 -p0
|
||||
%patch2
|
||||
chmod -x *.txt
|
||||
find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
|
||||
|
||||
@ -62,6 +65,7 @@ install -p -m 0644 %{SOURCE1} %{SOURCE2} .
|
||||
find $RPM_BUILD_ROOT%{py_sitedir} -name '*.exe' | xargs rm -f
|
||||
find $RPM_BUILD_ROOT%{py_sitedir} -name '*.txt' | xargs chmod -x
|
||||
chmod +x $RPM_BUILD_ROOT%{py_sitedir}/setuptools/command/easy_install.py
|
||||
%fdupes $RPM_BUILD_ROOT%{py_sitedir}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -73,6 +77,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{py_sitedir}/*
|
||||
|
||||
%changelog
|
||||
* Wed Oct 22 2008 skh@suse.de
|
||||
- add python-setuptools-distutils-log.diff:
|
||||
setuptools/command/sdist.py: import distutils.log [bnc#428177]
|
||||
- add python-setuptools-svn15.diff:
|
||||
setuptools/command/egg_info.py: recognize svn format version 1.5 magic
|
||||
number [also bnc#428177]
|
||||
* Mon Aug 18 2008 cthiel@suse.de
|
||||
- update to version 0.6c8
|
||||
* Prevent ``--help-commands`` and other junk from showing under Python 2.5
|
||||
|
16
setuptools-0.6c9-create-sitedir.patch
Normal file
16
setuptools-0.6c9-create-sitedir.patch
Normal file
@ -0,0 +1,16 @@
|
||||
--- setuptools/command/easy_install.py
|
||||
+++ setuptools/command/easy_install.py
|
||||
@@ -249,6 +249,13 @@
|
||||
instdir = normalize_path(self.install_dir)
|
||||
pth_file = os.path.join(instdir,'easy-install.pth')
|
||||
|
||||
+ # make sure that the directory exists
|
||||
+ if not os.path.exists(instdir):
|
||||
+ try:
|
||||
+ os.makedirs(instdir)
|
||||
+ except (OSError,IOError):
|
||||
+ self.cant_write_to_target()
|
||||
+
|
||||
# Is it a configured, PYTHONPATH, implicit, or explicit site dir?
|
||||
is_site_dir = instdir in self.all_site_dirs
|
||||
|
Loading…
Reference in New Issue
Block a user