From 0a7466a6a09be68737547ba5c51ebd466e974ec2 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: May 19 2014 03:41:38 +0000 Subject: Override setuptools version when building on EPEL7 --- diff --git a/blist-1.3.6-el7_098.patch b/blist-1.3.6-el7_098.patch new file mode 100644 index 0000000..65e1e05 --- /dev/null +++ b/blist-1.3.6-el7_098.patch @@ -0,0 +1,11 @@ +--- blist-1.3.6/ez_setup.py.el7_098 2014-05-19 09:48:05.766306506 +0700 ++++ blist-1.3.6/ez_setup.py 2014-05-19 09:50:20.257508472 +0700 +@@ -29,7 +29,7 @@ + except ImportError: + USER_SITE = None + +-DEFAULT_VERSION = "1.1.6" ++DEFAULT_VERSION = "0.9.8" + DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" + + def _python_cmd(*args): diff --git a/python-blist.spec b/python-blist.spec index 4f55924..1d9bbcc 100644 --- a/python-blist.spec +++ b/python-blist.spec @@ -18,13 +18,15 @@ Group: Development/Languages License: BSD URL: http://pypi.python.org/pypi/blist/ Source0: http://pypi.python.org/packages/source/b/blist/blist-%{version}.tar.gz -#Patch0: blist-1.2.1-use-sys-setuptools.patch +# EL7 has setuptools 0.9.8, not 1.1.6 +# override the version specified in ez_setup.py +Patch0: blist-1.3.6-el7_098.patch BuildRequires: python2-devel BuildRequires: python-setuptools %if 0%{?with_python3} BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: python3-setuptools %endif # if with_python3 %description @@ -64,7 +66,9 @@ identical performance. %prep %setup -q -n %{srcname}-%{version} -#patch0 -p1 -b .use-sys-setuptools +%if 0%{?el7} +%patch0 -p1 -b .el7_098 +%endif # Replace the not-zip-safe file; keep rpmlint happy by not having # CRLF line endings