rpms/python-setuptools/F-13 distribute-0.6.13-tests.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 python-setuptools.spec, 1.34, 1.35 sources, 1.19, 1.20 svn_versioning_4.patch, 1.1, NONE

Fri Jun 11 00:01:27 UTC 2010

Author: toshio

Update of /cvs/pkgs/rpms/python-setuptools/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2360

Modified Files:
	.cvsignore python-setuptools.spec sources 
Added Files:
	distribute-0.6.13-tests.patch 
Removed Files:
	svn_versioning_4.patch 
Log Message:

* Thu Jun 10 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.13-2
- Include data that's needed for running tests
- Update to upstream 0.6.13


distribute-0.6.13-tests.patch:
 MANIFEST.in                                                           |    1 +
 setuptools/tests/indexes/test_links_priority/external.html            |    3 +++
 setuptools/tests/indexes/test_links_priority/simple/foobar/index.html |    4 ++++
 3 files changed, 8 insertions(+)

--- NEW FILE distribute-0.6.13-tests.patch ---
diff -uNr distribute-0.6.13.pristine/MANIFEST.in distribute-0.6.13/MANIFEST.in
--- distribute-0.6.13.pristine/MANIFEST.in	2009-12-28 13:44:40.000000000 -0500
+++ distribute-0.6.13/MANIFEST.in	2010-06-10 19:43:39.508527227 -0400
@@ -1,5 +1,6 @@
 recursive-include setuptools *.py *.txt *.exe
 recursive-include tests *.py *.c *.pyx *.txt
+recursive-include setuptools/tests *.html
 recursive-include docs *.py *.txt *.conf *.css *.css_t Makefile indexsidebar.html
 include *.py
 include *.txt
diff -uNr distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/external.html distribute-0.6.13/setuptools/tests/indexes/test_links_priority/external.html
--- distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/external.html	1969-12-31 19:00:00.000000000 -0500
+++ distribute-0.6.13/setuptools/tests/indexes/test_links_priority/external.html	2010-06-10 19:40:53.190527048 -0400
@@ -0,0 +1,3 @@
+<html><body>
+<a href="/foobar-0.1.tar.gz#md5=1__bad_md5___">bad old link</a>
+</body></html>
diff -uNr distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html distribute-0.6.13/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html
--- distribute-0.6.13.pristine/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html	1969-12-31 19:00:00.000000000 -0500
+++ distribute-0.6.13/setuptools/tests/indexes/test_links_priority/simple/foobar/index.html	2010-06-10 19:40:53.187526243 -0400
@@ -0,0 +1,4 @@
+<html><body>
+<a href="/foobar-0.1.tar.gz#md5=0_correct_md5">foobar-0.1.tar.gz</a><br/>
+<a href="../../external.html" rel="homepage">external homepage</a><br/>
+</body></html>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/F-13/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	29 Jan 2010 03:51:36 -0000	1.19
+++ .cvsignore	11 Jun 2010 00:01:26 -0000	1.20
@@ -1 +1 @@
-distribute-0.6.10.tar.gz
+distribute-0.6.13.tar.gz


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/F-13/python-setuptools.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- python-setuptools.spec	4 Feb 2010 22:26:35 -0000	1.34
+++ python-setuptools.spec	11 Jun 2010 00:01:26 -0000	1.35
@@ -7,8 +7,8 @@
 %global srcname distribute
 
 Name:           python-setuptools
-Version:        0.6.10
-Release:        3%{?dist}
+Version:        0.6.13
+Release:        2%{?dist}
 Summary:        Easily build and distribute Python packages
 
 Group:          Applications/System
@@ -17,10 +17,11 @@ URL:            http://pypi.python.org/p
 Source0:        http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz
 Source1:        psfl.txt
 Source2:        zpl.txt
+Patch0:         distribute-0.6.13-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python-devel
+BuildRequires:  python2-devel
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 %endif # if with_python3
@@ -54,6 +55,8 @@ execute the software that requires pkg_r
 
 %prep
 %setup -q -n %{srcname}-%{version}
+%patch0 -p1
+
 find -name '*.txt' | xargs chmod -x
 
 %if 0%{?with_python3}
@@ -81,7 +84,7 @@ rm -rf %{buildroot}
 # to be the default for now).
 %if 0%{?with_python3}
 pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python3} setup.py install --skip-build --root %{buildroot}
 
 rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests
 
@@ -91,7 +94,7 @@ chmod +x %{buildroot}%{python3_sitelib}/
 popd
 %endif # with_python3
 
-%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install --skip-build --root %{buildroot}
 
 rm -rf ${buildroot}%{python_sitelib}/setuptools/tests
 
@@ -128,6 +131,13 @@ rm -rf $RPM_BUILD_ROOT
 %endif # with_python3
 
 %changelog
+* Thu Jun 10 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.13-2
+- Include data that's needed for running tests
+
+* Thu Jun 10 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.13-1
+- Update to upstream 0.6.13
+- Minor specfile formatting fixes
+
 * Thu Feb 04 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6.10-3
 - First build with python3 support enabled.
   


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-setuptools/F-13/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	29 Jan 2010 03:51:36 -0000	1.19
+++ sources	11 Jun 2010 00:01:26 -0000	1.20
@@ -1 +1 @@
-99fb4b3e4ef0861bba11aa1905e89fed  distribute-0.6.10.tar.gz
+43460b429e86bf0da2bb18574d63ec0c  distribute-0.6.13.tar.gz


--- svn_versioning_4.patch DELETED ---

