[python-redis/f20] Update to 2.10.3

Haïkel Guémar hguemar at fedoraproject.org
Sat Oct 25 13:58:20 UTC 2014


commit 0e6133a9f306bb65a13cc3adffe61116f73bf670
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Sat Oct 25 15:57:57 2014 +0200

    Update to 2.10.3
    
    - spec cleanups

 .gitignore        |    1 +
 python-redis.spec |   26 ++++++++++++++++----------
 sources           |    2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e3d611..95f8e16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /redis-2.7.6.tar.gz
 /redis-2.9.1.tar.gz
 /redis-2.10.1.tar.gz
+/redis-2.10.3.tar.gz
diff --git a/python-redis.spec b/python-redis.spec
index ecd1140..b97038b 100644
--- a/python-redis.spec
+++ b/python-redis.spec
@@ -1,13 +1,13 @@
-%if 0%{?fedora} >= 13 || 0%{?el} >= 8
+%if 0%{?fedora}
 %global with_python3 1
 %endif
 
 %global upstream_name redis
 
 Name:           python-%{upstream_name}
-Version:        2.10.1
+Version:        2.10.3
 Release:        1%{?dist}
-Summary:        Python 2.x interface to the Redis key-value store
+Summary:        Python 2 interface to the Redis key-value store
 License:        MIT
 URL:            http://github.com/andymccurdy/redis-py
 Source0:        http://pypi.python.org/packages/source/r/redis/redis-%{version}.tar.gz
@@ -22,20 +22,22 @@ BuildRequires:  redis
 This is a Python 2 interface to the Redis key-value store.
 
 %if 0%{?with_python3}
-%package -n     python3-redis
-Summary:        Python 3.x interface to the Redis key-value store
+%package -n     python3-%{upstream_name}
+Summary:        Python 3 interface to the Redis key-value store
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-py
 BuildRequires:  python3-pytest
 
-%description -n python3-redis
+%description -n python3-%{upstream_name}
 This is a Python 3 interface to the Redis key-value store.
 %endif
 
 %prep
 %setup -qn %{upstream_name}-%{version}
-rm -rf %{upstream_name}.egg-info
+rm -fr %{upstream_name}.egg-info
+# tests fails due to pytest >= 2.5.0 unavailable on F20
+sed -i 's/pytest>=2.5.0/pytest/' setup.py
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -56,18 +58,18 @@ pushd %{py3dir}
 %{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
 popd
 %endif
-
 %{__python2} setup.py install -O1 --skip-build --root %{buildroot}
 
 %check
 redis-server &
+PID_REDIS=$!
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} setup.py test
 popd
 %endif
 %{__python2} setup.py test
-kill %1
+kill $PID_REDIS
 
 %files
 %doc CHANGES LICENSE README.rst
@@ -75,13 +77,17 @@ kill %1
 %{python2_sitelib}/%{upstream_name}-%{version}-py%{python2_version}.egg-info
 
 %if 0%{?with_python3}
-%files -n python3-redis
+%files -n python3-%{upstream_name}
 %doc CHANGES LICENSE README.rst
 %{python3_sitelib}/%{upstream_name}
 %{python3_sitelib}/%{upstream_name}-%{version}-py%{python3_version}.egg-info
 %endif
 
 %changelog
+* Fri Oct 24 2014 Haikel Guémar <hguemar at fedoraproject> - 2.10.3-1
+- Update to 2.10.3
+- spec cleanups
+
 * Thu Jun 19 2014 Christopher Meng <rpm at cicku.me> - 2.10.1-1
 - Update to 2.10.1
 
diff --git a/sources b/sources
index e11b662..7760cfc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ffdea9c476b4815ddfee9a7362819ea  redis-2.10.1.tar.gz
+7619221ad0cbd124a5687458ea3f5289  redis-2.10.3.tar.gz


More information about the scm-commits mailing list