- split easy_install into -devel to drop python-devel requirement for pkg_resources...

- need only dep for python abi, which is automatic
- rel 2

Changed files:
    python-setuptools.spec -> 1.26

diff --git a/python-setuptools.spec b/python-setuptools.spec
index bb9c9c338b884d6e37e28ac236ca47e769a8c436..67227cf0f3837a4670ca33cd1fbfa891b4647817 100644 (file)
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -1,29 +1,30 @@
+# TODO:
+# - sync -pl
 %define                module  setuptools
-%define                sub     c8
-%define                rel             1
+%define                subver  c8
+%define                rel             2
 Summary:       A collection of enhancements to the Python distutils
 Summary(pl.UTF-8):     Zestaw rozszerzeń dla pythonowych distutils
 Name:          python-setuptools
 Version:       0.6
-Release:       1.%{sub}.%{rel}
+Release:       1.%{subver}.%{rel}
 Epoch:         1
 License:       GPL
 Group:         Development/Languages/Python
-Source0:       http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}%{sub}.tar.gz
+Source0:       http://cheeseshop.python.org/packages/source/s/setuptools/setuptools-%{version}%{subver}.tar.gz
 # Source0-md5: 0e9bbe1466f3ee29588cc09d3211a010
 URL:           http://peak.telecommunity.com/DevCenter/setuptools
-%pyrequires_eq python
 BuildRequires: python-devel
-Requires:      python-devel
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 setuptools is a collection of enhancements to the Python distutils
-(for Python 2.3.5 and up on most platforms; 64-bit platforms require a
-minimum of Python 2.4) that allow you to more easily build and
-distribute Python packages, especially ones that have dependencies on
-other packages.
+that allow you to more easily build and distribute Python packages,
+especially ones that have dependencies on other packages.
+
+This package contains the runtime components of setuptools, necessary
+to execute the software that requires pkg_resources.py.
 
 %description -l pl.UTF-8
 setuptools to zestaw rozszerzeń do pythonowych distutils (dla Pythona
@@ -32,11 +33,25 @@ co najmniej Pythona 2.4) umożliwiający łatwiejsze budowanie i
 rozprowadzanie pakietów Pythona, szczególnie tych mających zależności
 od innych pakietów.
 
+%package devel
+Summary:       Download, install, upgrade, and uninstall Python packages
+Group:         Development/Languages
+Requires:      %{name} = %{version}-%{release}
+Requires:      python-devel
+
+%description devel
+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.
+
+This package contains the components necessary to build and install
+software requiring setuptools.
+
 %prep
-%setup -q -n %{module}-%{version}%{sub}
+%setup -q -n %{module}-%{version}%{subver}
 
 %build
-python ./setup.py build
+%{__python} ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,8 +73,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.txt
-%attr(755,root,root) %{_bindir}/*
+%doc pkg_resources.txt setuptools.txt
 %{py_sitescriptdir}/%{module}*
-%{py_sitescriptdir}/*.py[co]
+%{py_sitescriptdir}/pkg_resources.py[co]
+%{py_sitescriptdir}/site.py[co]
 %{py_sitescriptdir}/site.py
+
+%files devel
+%defattr(644,root,root,755)
+%doc EasyInstall.txt README.txt api_tests.txt
+%attr(755,root,root) %{_bindir}/easy_install*
+%{py_sitescriptdir}/easy_install.py[co]