From 1cb34c641aaa283db5bd03709e641f403e58dfc1 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Dec 17 2014 16:29:42 +0000 Subject: Remove pytz version requirement in egginfo as it confuses newer setuptools --- diff --git a/babel-remove-pytz-version.patch b/babel-remove-pytz-version.patch new file mode 100644 index 0000000..8bc421b --- /dev/null +++ b/babel-remove-pytz-version.patch @@ -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, diff --git a/babel.spec b/babel.spec index c5d6fdc..7e2ecc4 100644 --- a/babel.spec +++ b/babel.spec @@ -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 - 1.3-7 +- Remove pytz version requirement in egginfo as it confuses newer setuptools + * Mon Jun 30 2014 Toshio Kuratomi - 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 - 1.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild