diff --git a/python-OWSLib.spec b/python-OWSLib.spec index 76d5e8f..a1a691e 100644 --- a/python-OWSLib.spec +++ b/python-OWSLib.spec @@ -1,23 +1,17 @@ # Works with either ElementTree or python-lxml %global modname OWSLib -%global with_python3 1 Name: python-%{modname} Version: 0.17.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Client library for OGC web services License: BSD URL: https://geopython.github.io/OWSLib Source0: https://files.pythonhosted.org/packages/source/O/%{modname}/%{modname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools -%endif # if with_python3 %global _description\ Package for client programming with Open Geospatial Consortium (OGC) web\ @@ -25,20 +19,6 @@ service (hence OWS) interface standards, and their related content models. %description %_description -%package -n python2-owslib -Summary: %summary -Requires: python2-pyproj -Requires: python2-dateutil -Requires: python2-requests -Requires: python2-pytz -%{?python_provide:%python_provide python2-owslib} -# Remove before F30 -Provides: %{name} = %{version}-%{release} -Obsoletes: %{name} < %{version}-%{release} - -%description -n python2-owslib %_description - -%if 0%{?with_python3} %package -n python3-OWSLib Summary: Client library for OGC web services @@ -50,64 +30,33 @@ Requires: python3-requests %description -n python3-OWSLib Package for client programming with Open Geospatial Consortium (OGC) web service (hence OWS) interface standards, and their related content models. -%endif # if with_python3 %prep -%setup -qc -n %{modname}-%{version} -rm -rf %{modname}-%{version}/%{modname}.egg-info -mv %{modname}-%{version} python2 +%setup -q -n %{modname}-%{version} +rm -rf %{modname}.egg-info -%if 0%{?with_python3} -cp -a python2 python3 -find python3 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' -%endif # with_python3 - -find python2 -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python2}|' - -pushd python2 -# TODO: Add LICENSE on the next release after 0.17.0 -# https://github.com/geopython/OWSLib/pull/519 -cp -pr README.rst CHANGES.rst AUTHORS.rst ../ -popd +find . -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %build -pushd python2 -%{__python2} setup.py build -popd - -%if 0%{?with_python3} -pushd python3 -%{__python3} setup.py build -popd -%endif # if with_python3 +%py3_build %install -pushd python2 -%{__python2} setup.py install --skip-build --root %{buildroot} -popd - -%if 0%{?with_python3} -pushd python3 -%{__python3} setup.py install --skip-build --root %{buildroot} -popd -%endif # if with_python3 +%py3_install -%files -n python2-owslib -%doc README.rst CHANGES.rst AUTHORS.rst -%{python2_sitelib}/owslib -%{python2_sitelib}/%{modname}-%{version}-py*.egg-info - -%if 0%{?with_python3} %files -n python3-OWSLib %doc README.rst CHANGES.rst AUTHORS.rst +# TODO: Add LICENSE on the next release after 0.17.0 %{python3_sitelib}/owslib %{python3_sitelib}/%{modname}-%{version}-py*.egg-info -%endif # if with_python3 %changelog +* Mon Feb 11 2019 Miro HronĨok - 0.17.0-3 +- Subpackage python2-owslib has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Feb 02 2019 Fedora Release Engineering - 0.17.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild