From 132b50ea46e6b70051b1bfb09d0ab21080777978 Mon Sep 17 00:00:00 2001 From: Volker Fröhlich Date: Jul 04 2018 22:12:26 +0000 Subject: Use python2 macros --- diff --git a/python-shapely.spec b/python-shapely.spec index 43eb623..cb36a70 100644 --- a/python-shapely.spec +++ b/python-shapely.spec @@ -36,7 +36,7 @@ BuildRequires: python3-matplotlib # We don't want to provide private python extension libs %{?filter_setup: -%filter_provides_in %{python_sitearch}/.*\.so$ +%filter_provides_in %{python2_sitearch}/.*\.so$ %filter_setup } @@ -54,7 +54,7 @@ See README.rst for more information! %package -n python2-shapely Summary: %summary -%{?python_provide:%python_provide python2-shapely} +%{?python2_provide:%python2_provide python2-shapely} %description -n python2-shapely %_description @@ -87,7 +87,7 @@ find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %build -%{__python} setup.py build +%{__python2} setup.py build %if 0%{?with_python3} pushd %{py3dir} @@ -96,7 +96,7 @@ pushd %{py3dir} %check -%{__python} setup.py test +%{__python2} setup.py test %if 0%{?with_python3} pushd %{py3dir} @@ -105,23 +105,23 @@ pushd %{py3dir} %install -%{__python} setup.py install --skip-build --root %{buildroot} +%{__python2} setup.py install --skip-build --root %{buildroot} %if 0%{?with_python3} pushd %{py3dir} %{__python3} setup.py install --skip-build --root %{buildroot} %endif # if with_python3 -rm -f %{buildroot}%{python_sitearch}/shapely/_geos.pxi +rm -f %{buildroot}%{python2_sitearch}/shapely/_geos.pxi rm -f %{buildroot}%{python3_sitearch}/shapely/_geos.pxi %files -n python2-shapely %doc CHANGES.txt README.rst CREDITS.txt LICENSE.txt %doc docs -%doc %{python_sitearch}/shapely/examples/ -%exclude %{python_sitearch}/shapely/examples/ -%{python_sitearch}/shapely/ -%{python_sitearch}/Shapely-%{version}%{?postrel:}-py*.egg-info +%doc %{python2_sitearch}/shapely/examples/ +%exclude %{python2_sitearch}/shapely/examples/ +%{python2_sitearch}/shapely/ +%{python2_sitearch}/Shapely-%{version}%{?postrel:}-py*.egg-info %if 0%{?with_python3} %files -n python3-shapely @@ -136,6 +136,7 @@ rm -f %{buildroot}%{python3_sitearch}/shapely/_geos.pxi %changelog * Wed Jul 04 2018 Volker Fröhlich - 1.6.4-1.post1 - New upstream release +- Use unambiguous python2 macros * Tue Jun 19 2018 Miro Hrončok - 1.5.16-13 - Rebuilt for Python 3.7