From 62309ad7424d1d4f01256255e0a5a07475abad0b Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Mar 27 2019 17:05:46 +0000 Subject: Subpackage python2-cairosvg has been removed --- diff --git a/python-cairosvg.spec b/python-cairosvg.spec index 5225509..fd67325 100644 --- a/python-cairosvg.spec +++ b/python-cairosvg.spec @@ -1,13 +1,9 @@ -%if 0%{?fedora} -%global with_python3 1 -%endif - %global modname cairosvg %global eggname CairoSVG Name: python-cairosvg Version: 1.0.20 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A Simple SVG Converter for Cairo License: LGPLv3+ @@ -16,14 +12,8 @@ Source0: http://pypi.python.org/packages/source/C/%{eggname}/%{eggnam BuildArch: noarch - -BuildRequires: python2-devel -BuildRequires: pycairo - -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-cairo -%endif %global _description\ CairoSVG is a SVG converter based on Cairo. It can export SVG files to PDF,\ @@ -34,14 +24,6 @@ http://www.cairosvg.org %description %_description -%package -n python2-cairosvg -Summary: %summary -Requires: pycairo -%{?python_provide:%python_provide python2-cairosvg} - -%description -n python2-cairosvg %_description - -%if 0%{?with_python3} %package -n python3-cairosvg Summary: A Simple SVG Converter for Cairo @@ -49,6 +31,9 @@ Summary: A Simple SVG Converter for Cairo # https://bugzilla.redhat.com/show_bug.cgi?id=1263793 Provides: python3-CairoSVG +# %%{_bindir}/cairosvg was moved from here +Conflicts: python2-cairosvg < 1.0.20-11 + Requires: python3-cairo %description -n python3-cairosvg @@ -57,50 +42,30 @@ PostScript and PNG files. For further information, please visit the CairoSVG Website http://www.cairosvg.org -%endif %prep %setup -q -n %{eggname}-%{version} # Remove bundled egg-info in case it exists rm -rf %{eggname}.egg-info -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif %build -%py2_build -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py build -popd -%endif %install -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py install -O1 --skip-build --root=%{buildroot} -mv %{buildroot}/%{_bindir}/cairosvg %{buildroot}/%{_bindir}/python3-cairosvg -popd -%endif -%py2_install -%files -n python2-cairosvg -%doc README.rst COPYING NEWS.rst TODO.rst -%{python2_sitelib}/%{modname}/ -%{python2_sitelib}/%{eggname}-%{version}* -%{_bindir}/cairosvg - -%if 0%{?with_python3} %files -n python3-cairosvg %doc README.rst COPYING NEWS.rst TODO.rst %{python3_sitelib}/%{modname}/ %{python3_sitelib}/%{eggname}-%{version}-* -%{_bindir}/python3-cairosvg -%endif +%{_bindir}/cairosvg %changelog +* Wed Mar 27 2019 Miro Hrončok - 1.0.20-11 +- Subpackage python2-cairosvg has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Feb 02 2019 Fedora Release Engineering - 1.0.20-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild