diff --git a/.gitignore b/.gitignore index b5b0c25..95f2e75 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ zope.interface-3.6.1.tar.gz /zope.interface-4.0.4.zip /zope.interface-4.0.5.zip /zope.interface-4.1.0.tar.gz +/zope.interface-4.1.1.tar.gz diff --git a/python-zope-interface.spec b/python-zope-interface.spec index 01fc7dd..8f5cda8 100644 --- a/python-zope-interface.spec +++ b/python-zope-interface.spec @@ -1,5 +1,11 @@ +%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 + # Filter private shared library provides -%filter_provides_in %{python_sitearch}/zope/interface/.*\.so$ +%filter_provides_in %{python2_sitearch}/zope/interface/.*\.so$ %filter_setup %if 0%{?fedora} @@ -9,8 +15,8 @@ Name: python-zope-interface -Version: 4.1.0 -Release: 4%{?dist} +Version: 4.1.1 +Release: 1%{?dist} Summary: Zope 3 Interface Infrastructure Group: Development/Libraries License: ZPLv2.1 @@ -64,7 +70,7 @@ cp -a . %{py3dir} %endif %build -CFLAGS="%{optflags}" %{__python} setup.py build +CFLAGS="%{optflags}" %{__python2} setup.py build %if 0%{?with_python3} pushd %{py3dir} @@ -88,13 +94,13 @@ popd %endif # do it again for python2 -%{__python} setup.py install -O1 --skip-build --root %{buildroot} +%{__python2} setup.py install -O1 --skip-build --root %{buildroot} # Will put docs in %%{_docdir} instead -%{__rm} -f %{buildroot}%{python_sitearch}/zope/interface/{,tests/}*.txt +%{__rm} -f %{buildroot}%{python2_sitearch}/zope/interface/{,tests/}*.txt # C files don't need to be packaged -%{__rm} -f %{buildroot}%{python_sitearch}/zope/interface/_zope_interface_coptimizations.c +%{__rm} -f %{buildroot}%{python2_sitearch}/zope/interface/_zope_interface_coptimizations.c %check PYTHONPATH=$(pwd) nosetests @@ -108,13 +114,13 @@ popd %files %defattr(-,root,root,-) %doc README.rst LICENSE.txt CHANGES.rst COPYRIGHT.txt docs/ -%{python_sitearch}/zope/interface/ -# Co-own %%{python_sitearch}/zope/ -%dir %{python_sitearch}/zope/ -%exclude %{python_sitearch}/zope/interface/tests/ -%exclude %{python_sitearch}/zope/interface/common/tests/ -%{python_sitearch}/zope.interface-*.egg-info -%{python_sitearch}/zope.interface-*-nspkg.pth +%{python2_sitearch}/zope/interface/ +# Co-own %%{python2_sitearch}/zope/ +%dir %{python2_sitearch}/zope/ +%exclude %{python2_sitearch}/zope/interface/tests/ +%exclude %{python2_sitearch}/zope/interface/common/tests/ +%{python2_sitearch}/zope.interface-*.egg-info +%{python2_sitearch}/zope.interface-*-nspkg.pth %if 0%{?with_python3} %files -n python3-zope-interface @@ -129,6 +135,10 @@ popd %endif %changelog +* Wed Aug 20 2014 Ralph Bean - 4.1.1-1 +- Latest upstream. +- Modernized python macros. + * Sun Aug 17 2014 Fedora Release Engineering - 4.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 2920be2..f648c11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac63de1784ea0327db876c908af07a94 zope.interface-4.1.0.tar.gz +edcd5f719c5eb2e18894c4d06e29b6c6 zope.interface-4.1.1.tar.gz