diff --git a/.gitignore b/.gitignore index 9c1e18f..1ce958f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ zope.testing-3.9.5.tar.gz /zope.testing-3.10.3.tar.gz /zope.testing-4.1.1.tar.gz /zope.testing-4.1.2.zip +/zope.testing-4.1.3.tar.gz diff --git a/python-zope-testing.spec b/python-zope-testing.spec index 9d23dff..4e49451 100644 --- a/python-zope-testing.spec +++ b/python-zope-testing.spec @@ -1,3 +1,9 @@ +%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())")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif + %global modname zope.testing %if 0%{?fedora} @@ -5,8 +11,8 @@ %endif Name: python-zope-testing -Version: 4.1.2 -Release: 4%{?dist} +Version: 4.1.3 +Release: 1%{?dist} Summary: Zope Testing Framework Group: Development/Languages License: ZPLv2.1 @@ -58,7 +64,7 @@ cp -a . %{py3dir} %endif %build -%{__python} setup.py build +%{__python2} setup.py build %if 0%{?with_python3} pushd %{py3dir} @@ -75,13 +81,13 @@ rm -f %{buildroot}%{python3_sitelib}/zope/__init__.py* popd %endif -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__python2} setup.py install -O1 --skip-build --root %{buildroot} # __init__.py* are not needed since .pth file is used -rm -f %{buildroot}%{python_sitelib}/zope/__init__.py* +rm -f %{buildroot}%{python2_sitelib}/zope/__init__.py* %check -%{__python} setup.py test +%{__python2} setup.py test %if 0%{?with_python3} pushd %{py3dir} @@ -92,10 +98,10 @@ popd %files %defattr(-,root,root,-) %doc COPYRIGHT.txt LICENSE.txt CHANGES.rst README.rst src/zope/testing/*.txt -%{python_sitelib}/zope/testing/ -%exclude %{python_sitelib}/zope/testing/*.txt -%{python_sitelib}/%{modname}-*.egg-info -%{python_sitelib}/%{modname}-*-nspkg.pth +%{python2_sitelib}/zope/testing/ +%exclude %{python2_sitelib}/zope/testing/*.txt +%{python2_sitelib}/%{modname}-*.egg-info +%{python2_sitelib}/%{modname}-*-nspkg.pth %if 0%{?with_python3} %files -n python3-zope-testing @@ -108,6 +114,10 @@ popd %endif %changelog +* Wed Aug 20 2014 Ralph Bean - 4.1.3-1 +- Latest upstream. +- Modernized python macros. + * Sun Jun 08 2014 Fedora Release Engineering - 4.1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index b4f5000..6a09f47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01c30c342c6a18002a762bd5d320a6e9 zope.testing-4.1.2.zip +6c73c5b668a67fdc116a25b884058ed9 zope.testing-4.1.3.tar.gz