From 36139fc71d4b897f88a4d0155868599484e31deccd5739afb4c54f66f84eb75b Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 23 Sep 2011 07:04:42 +0000 Subject: [PATCH] Dropped from Factory OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=38 --- python-setuptools-distutils-log.diff | 8 -- python-setuptools.changes | 20 +++++ python-setuptools.spec | 112 +++++++++------------------ setuptools-0.6c11.tar.bz2 | 3 - setuptools-0.6c12dev-r84273.tar.bz2 | 3 + 5 files changed, 60 insertions(+), 86 deletions(-) delete mode 100644 python-setuptools-distutils-log.diff delete mode 100644 setuptools-0.6c11.tar.bz2 create mode 100644 setuptools-0.6c12dev-r84273.tar.bz2 diff --git a/python-setuptools-distutils-log.diff b/python-setuptools-distutils-log.diff deleted file mode 100644 index 4302ea2..0000000 --- a/python-setuptools-distutils-log.diff +++ /dev/null @@ -1,8 +0,0 @@ -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 diff --git a/python-setuptools.changes b/python-setuptools.changes index c6f4d16..57ac527 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Sat Dec 11 21:16:05 UTC 2010 - saschpe@gmx.de + +- re-generated spec file with py2pack based on old spec file: + * now builds on Fedora and Mandriva + +------------------------------------------------------------------- +Wed Sep 1 16:29:11 UTC 2010 - jmatejek@novell.com + +- update to dev snapshot 0.6c12 - RPM version is set + to 0.6c11.99.r84273 so that version 0.6c12 will be an upgrade when + it comes +- this should fix "AttributeError: 'NoneType' object has no attribute 'clone'" + errors with python 2.7 + +------------------------------------------------------------------- +Tue Jan 12 10:50:45 UTC 2010 - alexandre@exatati.com.br + +- Removed obsolete python-setuptools-distutils-log.diff from sources. + ------------------------------------------------------------------- Tue Nov 10 00:30:36 UTC 2009 - alexandre@exatati.com.br diff --git a/python-setuptools.spec b/python-setuptools.spec index c2d78e1..508fc5d 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -1,7 +1,7 @@ # -# spec file for package python-setuptools (Version 0.6c8) +# spec file for package python-setuptools # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,42 +11,38 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. - +# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild - - -Name: python-setuptools -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes -%endif -%if 0%{?suse_version} >= 1110 -BuildRequires: python-base -%else -BuildRequires: python-devel -Requires: python-devel -%endif - %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} -BuildArch: noarch -%endif -Version: 0.6c11 -Release: 10 +%define mod_name setuptools + +Name: python-%{mod_name} +Version: 0.6c11.99.r84273 +Release: 0 +Url: http://pypi.python.org/pypi/setuptools Summary: Download, build, install, upgrade, and uninstall Python packages -- easily! -Group: Development/Libraries/Python -License: Other uncritical OpenSource License; Python Copyright -Url: http://cheeseshop.python.org/pypi/setuptools -Source: setuptools-%{version}.tar.bz2 +License: PSF or ZPL +Group: Development/Languages/Python +Source: %{mod_name}-0.6c12dev-r84273.tar.bz2 Source1: psfl.txt Source2: zpl.txt Patch1: setuptools-0.6c9-create-sitedir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: python-devel +%if 0%{?suse_version} %py_requires +%if 0%{?suse_version} > 1010 +BuildRequires: fdupes +%endif +%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildArch: noarch +%endif +%endif %description setuptools is a collection of enhancements to the Python distutils that @@ -54,73 +50,39 @@ allow you to more easily build and distribute Python packages, especially ones that have dependencies on other packages. - Authors: -------- Phillip J. Eby %prep -%setup -q -n setuptools-%{version} +export CFLAGS="%{optflags}" +%setup -q -n %{mod_name}-0.6c12dev-r84273 %patch1 chmod -x *.txt find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|' %build -export CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install -%{__python} setup.py install -O1 --skip-build \ - --prefix=%{_prefix} \ - --root $RPM_BUILD_ROOT \ - --single-version-externally-managed \ - --record-rpm=INSTALLED_FILES - -install -p -m 0644 %{SOURCE1} %{SOURCE2} . -find $RPM_BUILD_ROOT%{python_sitelib} -name '*.txt' -exec chmod -x {} ";" -chmod +x $RPM_BUILD_ROOT%{python_sitelib}/setuptools/command/easy_install.py -%if 0%{?suse_version} > 1020 -%fdupes $RPM_BUILD_ROOT%{python_sitelib} +%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?suse_version: --record-rpm=INSTALLED_FILES} +find %{buildroot}%{python_sitelib} -name '*.txt' -exec chmod -x {} ";" +chmod +x %{buildroot}%{python_sitelib}/setuptools/command/easy_install.py +%if 0%{?suse_version} > 1010 +%fdupes %{buildroot} %endif %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} -%files -f INSTALLED_FILES +%files %{?suse_version: -f INSTALLED_FILES} %defattr(-,root,root,-) -%doc *.txt -#%{_bindir}/* -#%{python_sitelib}/* +%if 0%{!?suse_version:1} +%{_bindir}/easy_install* +%python_sitelib/%{mod_name}* +%python_sitelib/easy_install.py* +%python_sitelib/pkg_resources.py* +%python_sitelib/site.py* +%endif %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 - when running ``easy_install --help``. - * Fixed GUI scripts sometimes not executing on Windows - * Fixed not picking up dependency links from recursive dependencies. - * Only make ``.py``, ``.dll`` and ``.so`` files executable when unpacking - eggs - * Changes for Jython compatibility -- changes in version 0.6c7 - * ``ftp:`` download URLs now work correctly. - * The default ``--index-url`` is now ``http://pypi.python.org/simple``, to - use the Python Package Index's new simpler (and faster!) REST API. -* Tue Aug 07 2007 cthiel@suse.de -- update to version 0.6c6 - * EasyInstall no longer aborts the installation process if a URL it wants - to retrieve can't be downloaded, unless the URL is an actual package - download. Instead, it issues a warning and tries to keep going. - * Fixed distutils-style scripts originally built on Windows having their - line endings doubled when installed on any platform. - * Added ``--local-snapshots-ok`` flag, to allow building eggs from - projects installed using ``setup.py develop``. - * Fixed not HTML-decoding URLs scraped from web pages -* Fri Feb 16 2007 cthiel@suse.de -- initial package (version 0.6c5) diff --git a/setuptools-0.6c11.tar.bz2 b/setuptools-0.6c11.tar.bz2 deleted file mode 100644 index 921f1e9..0000000 --- a/setuptools-0.6c11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bf037e8318650701fdd1f073953f8c0bc6656740e0f7735f02a5abba03cc46a -size 194048 diff --git a/setuptools-0.6c12dev-r84273.tar.bz2 b/setuptools-0.6c12dev-r84273.tar.bz2 new file mode 100644 index 0000000..20a738d --- /dev/null +++ b/setuptools-0.6c12dev-r84273.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0ec6f0d88f36e346d0904efa2411b3956f63e91f3e5be8d8cffd00ffb443bef +size 194138