Remove pytz version requirement in egginfo as it confuses newer setuptools

This commit is contained in:
Toshio Kuratomi 2014-12-17 08:29:42 -08:00
parent 5156204f1e
commit 1cb34c641a
2 changed files with 24 additions and 3 deletions

View File

@ -0,0 +1,15 @@
diff -up Babel-1.3/setup.py.bak Babel-1.3/setup.py
--- Babel-1.3/setup.py.bak 2014-12-17 08:15:47.607637242 -0800
+++ Babel-1.3/setup.py 2014-12-17 08:17:04.981559771 -0800
@@ -57,7 +57,10 @@ setup(
# This version identifier is currently necessary as
# pytz otherwise does not install on pip 1.4 or
# higher.
- 'pytz>=0a',
+ ### But the version confuses setuptools 8 and higher so remove it in the
+ ### system package
+ #'pytz>=0a',
+ 'pytz',
],
cmdclass={'build_doc': build_doc, 'test_doc': test_doc,

View File

@ -5,18 +5,19 @@
Name: babel
Version: 1.3
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Tools for internationalizing Python applications
Group: Development/Languages
License: BSD
URL: http://babel.pocoo.org/
Source0: https://pypi.python.org/packages/source/B/Babel/Babel-%{version}.tar.gz
Patch0: babel-remove-pytz-version.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel
BuildRequires: python2-devel
BuildRequires: python-setuptools
BuildRequires: pytz
@ -89,6 +90,8 @@ Documentation for Babel
%prep
%setup0 -q -n Babel-%{version}
%patch0 -p1
chmod a-x babel/messages/frontend.py
%if 0%{?with_python3}
@ -155,8 +158,11 @@ rm -rf %{buildroot}
%doc docs/*
%changelog
* Wed Dec 17 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 1.3-7
- Remove pytz version requirement in egginfo as it confuses newer setuptools
* Mon Jun 30 2014 Toshio Kuratomi <toshio@fedoraproject.org> - 1.3-6
- Change python-setuptools-devel BR into pyhton-setuptools
- Change python-setuptools-devel BR into python-setuptools
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild