From 27a64cc6fd1c92e4befac4bbeb4ae3888afa45157904b9429d531d1ac1899a2e Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 25 Jun 2013 09:01:42 +0000 Subject: [PATCH] - Update to version 0.7.4: + Issue #20: Fix comparison of parsed SVN version on Python 3. - Changes from version 0.7.3: + Issue #1: Disable installation of Windows-specific files on non-Windows systems. + Use new sysconfig module with Python 2.7 or >=3.2. - Changes from version 0.7.2: + Issue #14: Use markerlib when the `parser` module is not available. + Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI. - Changes from version 0.7.1: + Fix NameError (Issue #3) again - broken in bad merge. - Changes from version 0.7: + Merged Setuptools and Distribute. See docs/merge.txt for details. + Index URL now defaults to HTTPS. + Added experimental environment marker support. Now clients may designate a PEP-426 environment marker for "extra" dependencies. Setuptools uses this feature in ``setup.py`` for optional SSL and certificate validation support on older platforms. Based on Distutils-SIG discussions, the syntax is somewhat tentative. There should probably be a PEP with a firmer spec before the feature should be considered suitable for use. + Added support for SSL certificate validation when installing packages from an HTTPS service. - Use upstream URL, SDPX style licenses - Provide/obsolete python-distribute, which merged into setuptools-0.7.x OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools?expand=0&rev=39 --- python-setuptools.changes | 27 ++++++++++++ python-setuptools.spec | 68 +++++++++++------------------ setuptools-0.6c12dev-r84273.tar.bz2 | 3 -- 3 files changed, 53 insertions(+), 45 deletions(-) delete mode 100644 setuptools-0.6c12dev-r84273.tar.bz2 diff --git a/python-setuptools.changes b/python-setuptools.changes index 57ac527..6295612 100644 --- a/python-setuptools.changes +++ b/python-setuptools.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Jun 25 08:57:08 UTC 2013 - speilicke@suse.com + +- Update to version 0.7.4: + + Issue #20: Fix comparison of parsed SVN version on Python 3. +- Changes from version 0.7.3: + + Issue #1: Disable installation of Windows-specific files on non-Windows systems. + + Use new sysconfig module with Python 2.7 or >=3.2. +- Changes from version 0.7.2: + + Issue #14: Use markerlib when the `parser` module is not available. + + Issue #10: ``ez_setup.py`` now uses HTTPS to download setuptools from PyPI. +- Changes from version 0.7.1: + + Fix NameError (Issue #3) again - broken in bad merge. +- Changes from version 0.7: + + Merged Setuptools and Distribute. See docs/merge.txt for details. + + Index URL now defaults to HTTPS. + + Added experimental environment marker support. Now clients may designate a + PEP-426 environment marker for "extra" dependencies. Setuptools uses this + feature in ``setup.py`` for optional SSL and certificate validation support + on older platforms. Based on Distutils-SIG discussions, the syntax is + somewhat tentative. There should probably be a PEP with a firmer spec before + the feature should be considered suitable for use. + + Added support for SSL certificate validation when installing packages from + an HTTPS service. +- Use upstream URL, SDPX style licenses +- Provide/obsolete python-distribute, which merged into setuptools-0.7.x + ------------------------------------------------------------------- Sat Dec 11 21:16:05 UTC 2010 - saschpe@gmx.de diff --git a/python-setuptools.spec b/python-setuptools.spec index 508fc5d..d8042e5 100644 --- a/python-setuptools.spec +++ b/python-setuptools.spec @@ -1,7 +1,7 @@ # # spec file for package python-setuptools # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -15,74 +15,58 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%{!?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)")} -%define mod_name setuptools - -Name: python-%{mod_name} -Version: 0.6c11.99.r84273 +Name: python-setuptools +Version: 0.7.4 Release: 0 Url: http://pypi.python.org/pypi/setuptools -Summary: Download, build, install, upgrade, and uninstall Python packages -- easily! -License: PSF or ZPL +Summary: Easily download, build, install, upgrade, and uninstall Python packages +License: Python-2.0 or ZPL-2.0 Group: Development/Languages/Python -Source: %{mod_name}-0.6c12dev-r84273.tar.bz2 +Source: https://pypi.python.org/packages/source/s/setuptools/setuptools-%{version}.tar.gz 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} +# NOTE(saschpe): Distribute was merged into 0.7.x, so even though distribute +# obsoletes setuptools < 0.6.45, current setuptools obsoletes distribute again +Provides: python-distribute = %{version} +Obsoletes: python-distribute < %{version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else BuildArch: noarch %endif -%endif %description setuptools is a collection of enhancements to the Python distutils that allow you to more easily build and distribute Python packages, especially ones that have dependencies on other packages. - -Authors: --------- - Phillip J. Eby - %prep -export CFLAGS="%{optflags}" -%setup -q -n %{mod_name}-0.6c12dev-r84273 +%setup -q -n setuptools-%{version} %patch1 -chmod -x *.txt -find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|' +find . -type f -name "*.orig" -delete %build -%{__python} setup.py build +python setup.py build %install -%{__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 +python setup.py install --prefix=%{_prefix} --root=%{buildroot} -%clean -%{__rm} -rf %{buildroot} +%check +python setup.py test -%files %{?suse_version: -f INSTALLED_FILES} +%files %defattr(-,root,root,-) -%if 0%{!?suse_version:1} -%{_bindir}/easy_install* -%python_sitelib/%{mod_name}* +%doc CHANGES.txt README.txt +%{_bindir}/easy_install +%{_bindir}/easy_install-%{py_ver} +%{python_sitelib}/_markerlib +%{python_sitelib}/setuptools +%{python_sitelib}/setuptools-%{version}-py%{py_ver}.egg-info %python_sitelib/easy_install.py* %python_sitelib/pkg_resources.py* -%python_sitelib/site.py* -%endif %changelog diff --git a/setuptools-0.6c12dev-r84273.tar.bz2 b/setuptools-0.6c12dev-r84273.tar.bz2 deleted file mode 100644 index 20a738d..0000000 --- a/setuptools-0.6c12dev-r84273.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0ec6f0d88f36e346d0904efa2411b3956f63e91f3e5be8d8cffd00ffb443bef -size 194138