From 1fdd1ec732191b6647a69e76dc9f0c9ad75b1712 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Feb 11 2019 14:08:12 +0000 Subject: Subpackage python2-pysaml2 has been removed --- diff --git a/python-pysaml2.spec b/python-pysaml2.spec index 89c7cc9..2de9277 100644 --- a/python-pysaml2.spec +++ b/python-pysaml2.spec @@ -2,20 +2,14 @@ Name: python-%{srcname} Version: 4.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Python implementation of SAML Version 2 License: Apache 2.0 URL: https://github.com/IdentityPython/%{srcname} %global gittag v%{version} -%if 0%{?fedora} < 32 || 0%{?rhel} -%global with_python2 1 -%endif -%if 0%{?fedora} && ! 0%{?rhel} -%global with_python3 1 -%endif Source0: https://github.com/IdentityPython/%{srcname}/archive/%{gittag}/%{srcname}-%{version}.tar.gz @@ -31,37 +25,10 @@ written to work in a WSGI environment there are extensions that allow you to use it with other frameworks. -%if 0%{?with_python2} -%package -n python2-%{srcname} -Summary: Python implementation of SAML Version 2 - -%{?python_provide:%python_provide python2-%{srcname}} - -Requires: python2-requests >= 1.0.0 -Requires: python2-future -Requires: python2-cryptography -Requires: python2-pytz -Requires: python2-pyOpenSSL -Requires: python2-dateutil -Requires: python2-defusedxml -Requires: python2-six - -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -%description -n python2-%{srcname} -PySAML2 is a pure python implementation of SAML2. It contains all -necessary pieces for building a SAML2 service provider or an identity -provider. The distribution contains examples of both. Originally -written to work in a WSGI environment there are extensions that allow -you to use it with other frameworks. - -%endif -%if 0%{?with_python3} %package -n python3-%{srcname} Summary: Python implementation of SAML Version 2 - +Conflicts: python2-%{srcname} < 4.5.0-6 %{?python_provide:%python_provide python3-%{srcname}} Requires: python3-requests >= 1.0.0 @@ -83,7 +50,6 @@ provider. The distribution contains examples of both. Originally written to work in a WSGI environment there are extensions that allow you to use it with other frameworks. -%endif %package doc Summary: Documentation for Python implementation of SAML Version 2 @@ -114,13 +80,8 @@ touch --ref="$source".ts "$source" rm "$source".ts %build -%if 0%{?with_python2} - %py2_build -%endif -%if 0%{?with_python3} %py3_build -%endif # drop alabaster Sphinx theme, not packaged in Fedora yet #sed -i '/alabaster/d' doc/conf.py @@ -131,57 +92,29 @@ rm -rf html/.{doctrees,buildinfo} %install -%if 0%{?with_python3} %py3_install -for bin in parse_xsd2 make_metadata mdexport merge_metadata; do - mv %{buildroot}%{_bindir}/$bin.py %{buildroot}%{_bindir}/$bin-%{python3_version}.py - ln -s ./$bin-%{python3_version}.py %{buildroot}%{_bindir}/$bin-3.py -done -%endif - -%if 0%{?with_python2} -%py2_install -for bin in parse_xsd2 make_metadata mdexport merge_metadata; do - mv %{buildroot}%{_bindir}/$bin.py %{buildroot}%{_bindir}/$bin-%{python2_version}.py - ln -s ./$bin-%{python2_version}.py %{buildroot}%{_bindir}/$bin-2.py - ln -s ./$bin-%{python2_version}.py %{buildroot}%{_bindir}/$bin.py -done -%endif -%if 0%{?with_python2} -%files -n python2-%{srcname} + +%files -n python3-%{srcname} %doc README.rst %license LICENSE.txt %{_bindir}/parse_xsd2.py -%{_bindir}/parse_xsd2-2*.py %{_bindir}/make_metadata.py -%{_bindir}/make_metadata-2*.py %{_bindir}/mdexport.py -%{_bindir}/mdexport-2*.py %{_bindir}/merge_metadata.py -%{_bindir}/merge_metadata-2*.py -%{python2_sitelib}/saml2 -%{python2_sitelib}/*.egg-info -%endif - -%if 0%{?with_python3} -%files -n python3-%{srcname} -%doc README.rst -%license LICENSE.txt -%{_bindir}/parse_xsd2-3*.py -%{_bindir}/make_metadata-3*.py -%{_bindir}/mdexport-3*.py -%{_bindir}/merge_metadata-3*.py %{python3_sitelib}/saml2 %{python3_sitelib}/*.egg-info -%endif %files doc %license LICENSE.txt %doc html %changelog +* Mon Feb 11 2019 Miro Hrončok - 4.5.0-6 +- Subpackage python2-pysaml2 has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Feb 02 2019 Fedora Release Engineering - 4.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild