diff --git a/.gitignore b/.gitignore index ea3779c..5cab542 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ abrt-1.1.13.tar.gz /abrt-2.10.1.tar.gz /abrt-2.10.2.tar.gz /abrt-2.10.3.tar.gz +/abrt-2.10.4.tar.gz diff --git a/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch b/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch deleted file mode 100644 index ea52a98..0000000 --- a/0001-Quick-hack-to-fix-build-with-rpm-4.14.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c01551e6e9fd293a3f40e481afe8c28e786fe632 Mon Sep 17 00:00:00 2001 -From: Panu Matilainen -Date: Fri, 11 Aug 2017 13:24:26 +0300 -Subject: [PATCH] Quick hack to fix build with rpm >= 4.14 - -1) rpm >= 4.14 no longer has rpmCheckTerminate() call, it cleans up - automatically on exit(). Note that "needing" rpmCheckTerminate() - means the code is buggy: it does not properly track and free - rpmdb iterators and/or rpmts handles. -2) pgpPubkeyFingerprint() now returns the actual fingerprint, the - key ID which it previously returned is now retrieved by - pgpPubkeyKeyID() - -If compatibility to older versions is needed, these will need -configure checks, left as an excercise for someone more familiar -with the abrt codebase. ---- - src/daemon/rpm.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c -index 36b36a91..011e44ca 100644 ---- a/src/daemon/rpm.c -+++ b/src/daemon/rpm.c -@@ -76,11 +76,14 @@ void rpm_destroy() - rpmFreeMacros(NULL); - rpmFreeRpmrc(); - -+/* rpm >= 4.14 handles this automatically on exit */ -+#if 0 - /* RPM doc says "clean up any open iterators and databases". - * Observed to eliminate these Berkeley DB warnings: - * "BDB2053 Freeing read locks for locker 0x1e0: 28718/139661746636736" - */ - rpmdbCheckTerminate(1); -+#endif - #endif - - list_free_with_free(list_fingerprints); -@@ -100,7 +103,11 @@ void rpm_load_gpgkey(const char* filename) - } - - uint8_t keyID[8]; -+#if 0 - if (pgpPubkeyFingerprint(pkt, pklen, keyID) == 0) -+#else -+ if (pgpPubkeyKeyID(pkt, pklen, keyID) == 0) -+#endif - { - char *fingerprint = pgpHexStr(keyID, sizeof(keyID)); - if (fingerprint != NULL) --- -2.14.0 - diff --git a/abrt.spec b/abrt.spec index 4002713..3d0ebe1 100644 --- a/abrt.spec +++ b/abrt.spec @@ -54,13 +54,13 @@ %define docdirversion -%{version} %endif -%define libreport_ver 2.9.1 +%define libreport_ver 2.9.2 %define satyr_ver 0.22 Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.10.3 -Release: 6%{?dist} +Version: 2.10.4 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://abrt.readthedocs.org/ @@ -72,9 +72,6 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.ta # don't remove this patch, packages in rawhide are not signed! Patch0: disable-OpenGPGCheck-in-Fedora-Rawhide.patch -# Hacks for RPM 4.14 support -Patch1: 0001-Quick-hack-to-fix-build-with-rpm-4.14.patch - # '%%autosetup -S git' -> git BuildRequires: git @@ -85,7 +82,7 @@ BuildRequires: rpm-devel >= 4.6 BuildRequires: desktop-file-utils BuildRequires: libnotify-devel #why? BuildRequires: file-devel -BuildRequires: python-devel +BuildRequires: python2-devel BuildRequires: python3-devel BuildRequires: gettext BuildRequires: libxml2-devel @@ -116,7 +113,7 @@ Requires: systemd-units %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-python3 = %{version}-%{release} +Requires: python3-%{name} = %{version}-%{release} Requires(pre): shadow-utils Requires: python3-augeas Requires: python3-dbus @@ -259,7 +256,7 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Requires: abrt-addon-kerneloops Requires: kexec-tools -Requires: abrt-python3 +Requires: python3-abrt Requires: python3-augeas %description addon-vmcore @@ -290,27 +287,33 @@ 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 +# Remove before F30 +Provides: abrt-addon-python = %{version}-%{release} +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 +# Remove before F30 +Provides: abrt-addon-python3 = %{version}-%{release} +Provides: abrt-addon-python3%{?_isa} = %{version}-%{release} +Obsoletes: abrt-addon-python3 < %{version}-%{release} -%description addon-python3 +%description -n python3-abrt-addon This package contains python 3 hook and python analyzer plugin for handling uncaught exception in python 3 programs. @@ -350,7 +353,7 @@ Requires: %{name} = %{version}-%{release} Requires: libreport-cli >= %{libreport_ver} Requires: abrt-libs = %{version}-%{release} Requires: abrt-dbus -Requires: abrt-python +Requires: python2-abrt Requires: abrt-addon-ccpp Requires: python-argh Requires: python2-argcomplete @@ -371,7 +374,7 @@ Requires: abrt-addon-pstoreoops Requires: abrt-addon-vmcore %endif Requires: abrt-addon-ccpp -Requires: abrt-addon-python3 +Requires: python3-abrt-addon Requires: abrt-addon-xorg %if 0%{?rhel} Requires: libreport-rhel >= %{libreport_ver} @@ -405,7 +408,7 @@ Requires: abrt-addon-pstoreoops Requires: abrt-addon-vmcore %endif Requires: abrt-addon-ccpp -Requires: abrt-addon-python3 +Requires: python3-abrt-addon Requires: abrt-addon-xorg # Default config of addon-ccpp requires gdb BuildRequires: gdb-headless @@ -455,7 +458,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 +466,35 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: dbus-python Requires: libreport-python +Requires: python-gobject +%{?python_provide:%python_provide python2-abrt} +# Remove before F30 +Provides: %{name}-python = %{version}-%{release} +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 = %{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 +502,32 @@ Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-dbus = %{version}-%{release} Requires: python3-dbus Requires: libreport-python3 +Requires: python3-gobject +%{?python_provide:%python_provide python3-abrt} +# Remove before F30 +Provides: %{name}-python3 = %{version}-%{release} +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 python3-abrt-doc Summary: ABRT Python API Documentation Group: Documentation BuildArch: noarch BuildRequires: python3-devel Requires: %{name} = %{version}-%{release} -Requires: %{name}-python3 = %{version}-%{release} +Requires: python3-%{name} = %{version}-%{release} +# Remove before F30 +Provides: %{name}-python3-doc = %{version}-%{release} +Obsoletes: %{name}-python3-doc < %{version}-%{release} -%description python3-doc +%description -n python3-abrt-doc Examples and documentation for ABRT Python 3 API. %package console-notification @@ -613,10 +634,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 +1058,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 +1070,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 +1151,41 @@ 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 +* Mon Aug 28 2017 Matej Habrnal 2.10.4-1 +- Translation updates +- logging: rename log() to log_warning() +- Quick hack to fix build with rpm >= 4.14 +- cli,dbus: Allow polkit to be optional at build time +- spec: add dependency for python{3}-gobject +- a-d-journal-core: fix bad condition in creating reason msg +- a-d-journal-core: use pid of crashed process in dumpdir name +- changelog: update CHANGELOG.md + +* 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) diff --git a/sources b/sources index 8ac10eb..3c2b8b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (abrt-2.10.3.tar.gz) = dac86703c60f1b56b8cfa7b2e400f5165a0ee9bd457667dec71981f9475b35552c80d5c5864de22414d83f4ce8ea29300d299f36e7fe4eb77a80112d6a1852ab +SHA512 (abrt-2.10.4.tar.gz) = f87fa0592867ef9c8543f066ffd9a0595941c14b4b0420746ebd7ca9e1335d45f0323d2e299778171031f0537e0e8da3dcfd33e3e6adae1cd76e33af7b131504