Merge branch 'master' into f13

Conflicts:
	.gitignore
	python-setuptools.spec
This commit is contained in:
Toshio Kuratomi 2010-08-10 15:02:02 -04:00
commit 56fb46dd94
2 changed files with 11 additions and 2 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
distribute-0.6.13.tar.gz distribute-0.6.14.tar.gz

View File

@ -8,7 +8,7 @@
Name: python-setuptools Name: python-setuptools
Version: 0.6.14 Version: 0.6.14
Release: 1%{?dist} Release: 3%{?dist}
Summary: Easily build and distribute Python packages Summary: Easily build and distribute Python packages
Group: Applications/System Group: Applications/System
@ -41,6 +41,7 @@ have dependencies on other packages.
This package contains the runtime components of setuptools, necessary to This package contains the runtime components of setuptools, necessary to
execute the software that requires pkg_resources.py. execute the software that requires pkg_resources.py.
This package contains the distribute fork of setuptools.
%if 0%{?with_python3} %if 0%{?with_python3}
%package -n python3-setuptools %package -n python3-setuptools
Summary: Easily build and distribute Python 3 packages Summary: Easily build and distribute Python 3 packages
@ -53,6 +54,8 @@ have dependencies on other packages.
This package contains the runtime components of setuptools, necessary to This package contains the runtime components of setuptools, necessary to
execute the software that requires pkg_resources.py. execute the software that requires pkg_resources.py.
This package contains the distribute fork of setuptools.
%endif # with_python3 %endif # with_python3
%prep %prep
@ -133,6 +136,12 @@ rm -rf %{buildroot}
%endif # with_python3 %endif # with_python3
%changelog %changelog
* Tue Aug 10 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 0.6.14-3
- Update description to mention this is distribute
* Thu Jul 22 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.6.14-2
- bump for building against python 2.7
* Thu Jul 22 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.6.14-1 * Thu Jul 22 2010 Thomas Spura <tomspur@fedoraproject.org> - 0.6.14-1
- update to new version - update to new version
- all patches are upsteam - all patches are upsteam