diff --git a/abrt.spec b/abrt.spec index 4002713..74d1f6b 100644 --- a/abrt.spec +++ b/abrt.spec @@ -60,7 +60,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.10.3 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -290,25 +290,25 @@ Provides: libreport-plugin-bodhi = %{version}-%{release} %description plugin-bodhi Search for a new updates in bodhi server. -%package addon-python +%package -n python2-abrt-addon Summary: %{name}'s addon for catching and analyzing Python exceptions Group: System Environment/Libraries -Requires: python Requires: %{name} = %{version}-%{release} Requires: systemd-python -Requires: abrt-python +Requires: python2-abrt +Provides: abrt-addon-python%{?_isa} = %{version}-%{release} +Obsoletes: abrt-addon-python < %{version}-%{release} -%description addon-python +%description -n python2-abrt-addon This package contains python hook and python analyzer plugin for handling uncaught exception in python programs. -%package addon-python3 +%package -n python3-abrt-addon Summary: %{name}'s addon for catching and analyzing Python 3 exceptions Group: System Environment/Libraries -Requires: python3 Requires: %{name} = %{version}-%{release} Requires: python3-systemd -Requires: abrt-python3 +Requires: python3-abrt %description addon-python3 This package contains python 3 hook and python analyzer plugin for handling @@ -455,7 +455,7 @@ ABRT DBus service which provides org.freedesktop.problems API on dbus and uses PolicyKit to authorize to access the problem data. -%package python +%package -n python2-abrt Summary: ABRT Python API Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} @@ -463,26 +463,33 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: dbus-python Requires: libreport-python +%{?python_provide:%python_provide python2-abrt} +# Remove before F30 +Provides: %{name}-python%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python < %{version}-%{release} BuildRequires: python-nose BuildRequires: python-sphinx BuildRequires: libreport-python -%description python +%description -n python2-abrt High-level API for querying, creating and manipulating problems handled by ABRT in Python. -%package python-doc +%package -n python2-abrt-doc Summary: ABRT Python API Documentation Group: Documentation BuildArch: noarch BuildRequires: python2-devel Requires: %{name} = %{version}-%{release} -Requires: %{name}-python = %{version}-%{release} +Requires: python2-abrt = %{version}-%{release} +# Remove before F30 +Provides: %{name}-python-doc%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python-doc < %{version}-%{release} -%description python-doc +%description -n python2-abrt-doc Examples and documentation for ABRT Python API. -%package python3 +%package -n python3-abrt Summary: ABRT Python 3 API Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} @@ -490,23 +497,30 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: python3-dbus Requires: libreport-python3 +%{?python_provide:%python_provide python3-abrt} +# Remove before F30 +Provides: %{name}-python3%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python3 < %{version}-%{release} BuildRequires: python3-nose BuildRequires: python3-sphinx BuildRequires: libreport-python3 -%description python3 +%description -n python3-abrt High-level API for querying, creating and manipulating problems handled by ABRT in Python 3. -%package python3-doc +%package -n abrt-python3-doc Summary: ABRT Python API Documentation Group: Documentation BuildArch: noarch BuildRequires: python3-devel Requires: %{name} = %{version}-%{release} Requires: %{name}-python3 = %{version}-%{release} +# Remove before F30 +Provides: %{name}-python3-doc%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-python3-doc < %{version}-%{release} -%description python3-doc +%description -n abrt-python3-doc Examples and documentation for ABRT Python 3 API. %package console-notification @@ -613,10 +627,10 @@ chown -R abrt:abrt %{_localstatedir}/cache/abrt-di %systemd_post abrt-xorg.service %journal_catalog_update -%post addon-python +%post -n python2-abrt-addon %journal_catalog_update -%post addon-python3 +%post -n python3-abrt-addon %journal_catalog_update %if %{?have_kexec_tools} == 1 @@ -1037,7 +1051,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_mandir}/man1/abrt-harvest-pstoreoops.1* %{_mandir}/man1/abrt-merge-pstoreoops.1* -%files addon-python +%files -n python2-abrt-addon %config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf %{_datadir}/%{name}/conf.d/plugins/python.conf %{_mandir}/man5/abrt-python.conf.5* @@ -1049,7 +1063,7 @@ killall abrt-dbus >/dev/null 2>&1 || : %{python_sitearch}/abrt*.py* %{python_sitearch}/abrt.pth -%files addon-python3 +%files -n python3-abrt-addon %config(noreplace) %{_sysconfdir}/%{name}/plugins/python3.conf %{_datadir}/%{name}/conf.d/plugins/python3.conf %{_mandir}/man5/abrt-python3.conf.5* @@ -1130,24 +1144,31 @@ killall abrt-dbus >/dev/null 2>&1 || : %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/*.css %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_dbus_event.conf -%files python +%files -n python2-abrt %{python_sitearch}/problem/ %{_mandir}/man5/abrt-python.5* -%files python-doc +%files -n python2-abrt-doc %{python_sitelib}/problem_examples -%files python3 +%files -n python3-abrt %{python3_sitearch}/problem/ %{_mandir}/man5/abrt-python3.5* -%files python3-doc +%files -n python3-abrt-doc %{python3_sitelib}/problem_examples %files console-notification %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Wed Aug 16 2017 Zbigniew Jędrzejewski-Szmek - 2.10.3-7 +- Python 2 binary package renamed to python2-abrt + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 +- Python 3 binary package renamed to python3-abrt +- Add-on packages renamed to python[23]-abrt-addon +- Documentation packages renamed to python[23]-abrt-doc + * Fri Aug 11 2017 Igor Gnatenko - 2.10.3-6 - Rebuilt after RPM update (№ 3)