From 7300b45b7afc8cb92993445978c1ce7bd81eaeb0 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Mon, 23 Feb 2015 23:36:21 +0100 Subject: [PATCH] Upstream 1.9.0 - Packaging cleanups --- .gitignore | 1 + python-six.spec | 19 ++++++++++++------- sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 64042f6..5ca99c7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /six-1.6.1.tar.gz /six-1.7.3.tar.gz /six-1.8.0.tar.gz +/six-1.9.0.tar.gz diff --git a/python-six.spec b/python-six.spec index fda3c32..e87a1ba 100644 --- a/python-six.spec +++ b/python-six.spec @@ -1,15 +1,16 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%if 0%{?rhel} && 0%{?rhel} <= 6 +%{!?__python2: %global __python2 /usr/bin/python2} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif %if 0%{?fedora} > 12 || 0%{?rhel} > 7 %global with_python3 1 %global __python3 python3 - -%{!?python3_sitelib: %global python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %endif Name: python-six -Version: 1.8.0 +Version: 1.9.0 Release: 1%{?dist} Summary: Python 2 and 3 compatibility utilities @@ -57,7 +58,7 @@ cp -a . %{py3dir} %build -%{__python} setup.py build +%{__python2} setup.py build %if 0%{?with_python3} pushd %{py3dir} %{__python3} setup.py build @@ -70,7 +71,7 @@ pushd %{py3dir} %{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT popd %endif -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %check @@ -86,7 +87,7 @@ popd %{!?_licensedir:%global license %%doc} %license LICENSE %doc README documentation/index.rst -%{python_sitelib}/* +%{python2_sitelib}/* %if 0%{?with_python3} %files -n python3-six @@ -98,6 +99,10 @@ popd %changelog +* Mon Feb 23 2015 Haïkel Guémar - 1.9.0-1 +- Upstream 1.9.0 +- Packaging cleanups + * Fri Nov 14 2014 Slavek Kabrda - 1.8.0-1 - upgrade to 1.8.0 (rhbz#1105861) diff --git a/sources b/sources index dc6d52a..949fec9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1626eb24cc889110c38f7e786ec69885 six-1.8.0.tar.gz +476881ef4012262dfc8adc645ee786c4 six-1.9.0.tar.gz