X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=abrt.spec;h=e10d5a3059ebd36d075d156af3af6971e1730126;hb=e8a41dea17f42ee5768f484a7ea38c8bab408e87;hp=62a0b95951e182e05eac74a14e4b72d68626ff06;hpb=09319cb6808bfc1a963d70c27cb2bfd3395f0860;p=packages%2Fabrt.git

diff --git a/abrt.spec b/abrt.spec
index 62a0b95..e10d5a3 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -2,49 +2,58 @@
 # TODO:
 # - handle obsolete packages: abrt-plugin-{catcut,rhfastcheck,rhticket,ticketuploader}
 # - SysV init scripts for -addon-ccpp, -addon-kerneloops, -addon-pstoreoops, -addon-upload-watch, -addon-vmcore, -addon-xorg
-%define		libreport_ver	2.1.9
+# - teach build system to use python3.2+ __pycache__
+#
+# Conditional build:
+%bcond_without	tests	# disable pythontests
+#
+%define		libreport_ver	2.9.0
 Summary:	Automatic bug detection and reporting tool
 Summary(pl.UTF-8):	Narzędzie do automatycznego wykrywania i zgłaszania błędów
 Name:		abrt
-Version:	2.1.9
+Version:	2.10.0
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
-# Source0-md5:	b70b03cfb9f496152949ebf92abe6479
+# Source0-md5:	050088fd550a8a063e2e21230b0588de
 Source1:	%{name}.init
 Patch0:		%{name}-rpm5.patch
 Patch1:		%{name}-rpm45.patch
-Patch2:		format_security.patch
-Patch3:		%{name}-link.patch
-Patch4:		%{name}-pythondir.patch
+Patch2:		%{name}-link.patch
 URL:		https://fedorahosted.org/abrt/
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	dbus-devel
-BuildRequires:	gettext-devel >= 0.17
-BuildRequires:	glib2-devel >= 1:2.21
+BuildRequires:	docbook-dtd45-xml
+BuildRequires:	gettext-tools >= 0.17
+BuildRequires:	glib2-devel >= 1:2.43
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.15.1
 BuildRequires:	gtk+3-devel >= 3.0
+BuildRequires:	hawkey-devel
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	json-c-devel
-BuildRequires:	libmagic-devel
-BuildRequires:	libnotify-devel
+BuildRequires:	libnotify-devel >= 0.7.0
 BuildRequires:	libreport-devel >= %{libreport_ver}
 BuildRequires:	libreport-gtk-devel >= %{libreport_ver}
 BuildRequires:	libreport-web-devel >= %{libreport_ver}
+BuildRequires:	libselinux-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 2
-BuildRequires:	rpm-devel >= 4.5
 BuildRequires:	nss-devel
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel
-BuildRequires:	python-devel
-BuildRequires:	python-modules
+BuildRequires:	python-devel >= 2
+BuildRequires:	python-modules >= 2
+%{?with_tests:BuildRequires:	python-nose}
+BuildRequires:	python3-devel >= 3
+BuildRequires:	python3-modules >= 3
 BuildRequires:	rpm-devel >= 4.5-28
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
-BuildRequires:	satyr-devel
+BuildRequires:	satyr-devel >= 0.21
+BuildRequires:	systemd-devel
 BuildRequires:	xmlto
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -61,6 +70,8 @@ Obsoletes:	abrt-plugin-sosreport
 Obsoletes:	abrt-plugin-sqlite3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define	journal_catalog_update	[ ! -x /bin/journalctl ] || /bin/journalctl --update-catalog || :
+
 %description
 ABRT is a tool to help users to detect defects in applications and to
 create a bug report with all informations needed by maintainer to fix
@@ -72,11 +83,24 @@ aplikacjach oraz tworzeniu raportów błędów ze wszystkimi informacjami
 potrzebnymi utrzymującemu pakiet do poprawienia go. Wykorzystuje
 system wtyczek do rozszerzania funkcjonalności.
 
+%package -n bash-completion-abrt
+Summary:	Bash completion for abrt command
+Summary(pl.UTF-8):	Bashowe dopełnianie parametrów dla polecenia abrt
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion
+
+%description -n bash-completion-abrt
+Bash completion for abrt command.
+
+%description -n bash-completion-abrt -l pl.UTF-8
+Bashowe dopełnianie parametrów dla polecenia abrt.
+
 %package libs
 Summary:	ABRT shared library
 Summary(pl.UTF-8):	Biblioteka współdzielona ABRT
 Group:		Libraries
-Requires:	glib2 >= 1:2.21
+Requires:	glib2 >= 1:2.43
 Requires:	libreport >= %{libreport_ver}
 
 %description libs
@@ -90,7 +114,7 @@ Summary:	Header files for ABRT livrary
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotekia ABRT
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.21
+Requires:	glib2-devel >= 1:2.43
 Requires:	libreport-devel >= %{libreport_ver}
 
 %description devel
@@ -104,12 +128,14 @@ Summary:	ABRT's C/C++ addon
 Summary(pl.UTF-8):	Dodatek C/C++ do ABRT
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-addon-coredump-helper = %{version}-%{release}
 Requires:	%{name}-retrace-client = %{version}-%{release}
 Requires:	cpio
 Requires:	elfutils
 Requires:	gdb >= 7.0-3
-Requires:	satyr
+Requires:	satyr >= 0.21
 Requires:	yum-utils
+Obsoletes:	%{name}-atomic
 
 %description addon-ccpp
 This package contains hook for C/C++ crashed programs and abrt's C/C++
@@ -119,6 +145,18 @@ analyzer plugin.
 Ten pakiet zawiera punkt zaczepienia dla programów w C/C++, które
 uległy awarii oraz wtyczkę analizatora C/C++ ABRT.
 
+%package addon-coredump-helper
+Summary:	ABRT's /proc/sys/kernel/core_pattern helper
+Summary(pl.UTF-8):	Program pomocniczy ABRT do /proc/sys/kernel/core_pattern
+Group:		Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description addon-coredump-helper
+This package contains hook for C/C++ crashed programs.
+
+%description addon-coredump-helper -l pl.UTF-8
+Ten pakiet zawiera uchwyt dla programów w C/C++, które uległy awarii.
+
 %package addon-kerneloops
 Summary:	ABRT's kerneloops addon
 Summary(pl.UTF-8):	Dodatek kerneloops do ABRT
@@ -153,20 +191,45 @@ storage.
 Ten pakiet zawiera wtyczkę do zbierania oopsów jądra z danych pstore.
 
 %package addon-python
-Summary:	ABRT's addon for catching and analyzing Python exceptions
-Summary(pl.UTF-8):	Dodatek ABRT do przechwytywania i analizy wyjątków Pythona
+Summary:	ABRT's addon for catching and analyzing Python 2 exceptions
+Summary(pl.UTF-8):	Dodatek ABRT do przechwytywania i analizy wyjątków Pythona 2
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-python = %{version}-%{release}
+# for detecting package name containing offending file
+Suggests:	python-rpm
+# for logging to journal
+Suggests:	python-systemd
 Obsoletes:	gnome-python2-bugbuddy
 
 %description addon-python
 This package contains Python hook and Python analyzer plugin for
-handling uncaught exception in Python programs.
+handling uncaught exception in Python 2 programs.
 
 %description addon-python -l pl.UTF-8
 Ten pakiet zawiera pythonowy punkt zaczepienia oraz wtyczkę
 analizatora Pythona do obsługi nie obsłużonych wyjątków w programach w
-Pythonie.
+Pythonie 2.
+
+%package addon-python3
+Summary:	ABRT's addon for catching and analyzing Python 3 exceptions
+Summary(pl.UTF-8):	Dodatek ABRT do przechwytywania i analizy wyjątków Pythona 3
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-python3 = %{version}-%{release}
+# for detecting package name containing offending file (TODO: python3-rpm package)
+#Suggests:	python3-rpm
+# for logging to journal (TODO: python3-systemd package)
+#Suggests:	python3-systemd
+
+%description addon-python3
+This package contains Python hook and Python analyzer plugin for
+handling uncaught exception in Python 3 programs.
+
+%description addon-python3 -l pl.UTF-8
+Ten pakiet zawiera pythonowy punkt zaczepienia oraz wtyczkę
+analizatora Pythona do obsługi nie obsłużonych wyjątków w programach w
+Pythonie 3.
 
 %package addon-upload-watch
 Summary:	ABRT's upload addon
@@ -186,8 +249,7 @@ Summary(pl.UTF-8):	Dodatek vmcore do ABRT
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-addon-kerneloops = %{version}-%{release}
-# not available in PLD
-#Requires:	crash
+Requires:	crash
 
 %description addon-vmcore
 This package contains plugin for collecting kernel crash information
@@ -212,6 +274,20 @@ from Xorg log.
 Ten pakiet zawiera wtyczkę do zbierania informacji o awarii jądra z
 logu Xorg.
 
+%package atomic
+Summary:	Package to make easy default installation on Atomic hosts
+Summary(pl.UTF-8):	Pakiet ułatwiający domyślną instalację na hostach Atomic
+Group:		Applications/System
+Requires:	%{name}-addon-coredump-helper = %{version}-%{release}
+Obsoletes:	%{name}-addon-ccpp
+
+%description atomic
+Package to install all necessary packages for usage from Atomic hosts.
+
+%description atomic -l pl.UTF-8
+Pakiet służący do instalacji wszystkich wymaganych pakietów
+przeznaczonych do użycia z hostów Atomic.
+
 %package plugin-bodhi
 Summary:	ABRT's bodhi plugin
 Summary(pl.UTF-8):	Wtyczka bodhi do ABRT
@@ -258,18 +334,34 @@ org.freedesktop.problems, używająca PolicyKit do autoryzacji dostępu
 do danych o problemach.
 
 %package python
-Summary:	ABRT Python API
-Summary(pl.UTF-8):	API Pythona do ABRT
+Summary:	ABRT Python 2 API
+Summary(pl.UTF-8):	API Pythona 2 do ABRT
 Group:		Libraries/Python
 Requires:	%{name} = %{version}-%{release}
+Requires:	python-libreport >= %{libreport_ver}
 
 %description python
 High-level API for querying, creating and manipulating problems
-handled by ABRT in Python.
+handled by ABRT in Python 2.
 
 %description python -l pl.UTF-8
 Wysokopoziomowe API do odpytywania, tworzenia i obróbki z poziomu
-Pythona problemów obsługiwanych przez ABRT.
+Pythona 2 problemów obsługiwanych przez ABRT.
+
+%package python3
+Summary:	ABRT Python 3 API
+Summary(pl.UTF-8):	API Pythona 3 do ABRT
+Group:		Libraries/Python
+Requires:	%{name} = %{version}-%{release}
+Requires:	python3-libreport >= %{libreport_ver}
+
+%description python3
+High-level API for querying, creating and manipulating problems
+handled by ABRT in Python.
+
+%description python3 -l pl.UTF-8
+Wysokopoziomowe API do odpytywania, tworzenia i obróbki z poziomu
+Pythona 3 problemów obsługiwanych przez ABRT.
 
 %package cli
 Summary:	ABRT's command line interface
@@ -279,8 +371,8 @@ Requires:	%{name} = %{version}-%{release}
 # analyzers
 Requires:	%{name}-addon-ccpp = %{version}-%{release}
 Requires:	%{name}-addon-kerneloops = %{version}-%{release}
-Requires:	%{name}-addon-python = %{version}-%{release}
 Requires:	%{name}-addon-pstoreoops = %{version}-%{release}
+Requires:	%{name}-addon-python = %{version}-%{release}
 # reporters
 Requires:	libreport-plugin-bugzilla >= %{libreport_ver}
 Requires:	libreport-plugin-logger >= %{libreport_ver}
@@ -351,8 +443,8 @@ Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-addon-ccpp = %{version}-%{release}
 Requires:	%{name}-addon-kerneloops = %{version}-%{release}
-Requires:	%{name}-addon-python = %{version}-%{release}
 Requires:	%{name}-addon-pstoreoops = %{version}-%{release}
+Requires:	%{name}-addon-python = %{version}-%{release}
 Requires:	%{name}-addon-vmcore = %{version}-%{release}
 Requires:	%{name}-addon-xorg = %{version}-%{release}
 Requires:	%{name}-gui = %{version}-%{release}
@@ -395,17 +487,18 @@ się do powłoki.
 %patch1 -p1
 %endif
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+%{__sed} -n -e '/^%%changelog/,$p' abrt.spec.in | tail -n +2 > changelog
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
 	--disable-silent-rules \
+	%{!?with_tests:--without-pythontests} \
 	--with-systemdsystemunitdir=%{systemdunitdir}
 
 %{__make}
@@ -413,7 +506,9 @@ się do powłoki.
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	pythondir=%{py_sitescriptdir} \
+	python3dir=%{py3_sitescriptdir}
 
 %py_postclean
 
@@ -425,16 +520,26 @@ install -d $RPM_BUILD_ROOT/var/cache/%{name}
 install -d $RPM_BUILD_ROOT/var/cache/%{name}-di
 install -d $RPM_BUILD_ROOT/var/run/%{name}
 
-install -d $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
-cat >$RPM_BUILD_ROOT/usr/lib/tmpfiles.d/abrt.conf <<EOF
+install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
+cat > $RPM_BUILD_ROOT%{systemdtmpfilesdir}/abrt.conf <<EOF
 d /var/run/%{name} 0755 root root -
 EOF
 
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/problem/*.la
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/problem/*.la
 # examples
 %{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/problem_examples
-# outdated copy of lt
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/lt_LT
+%{__rm} -r $RPM_BUILD_ROOT%{py3_sitescriptdir}/problem_examples
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/abrt/README.md
+
+# fool man verification - report_event.conf.5 belongs to libreport (NOTE: don't package it here)
+touch $RPM_BUILD_ROOT%{_mandir}/man5/report_event.conf.5
+
+# empty version of nb,ru
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{no,ru_RU}
+# not supported by glibc yet
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ach,aln,bal,ilo}
 
 %find_lang %{name}
 
@@ -468,12 +573,16 @@ fi
 
 %post addon-ccpp
 %systemd_post abrt-ccpp.service
+%systemd_post abrt-journal-core.service
+%journal_catalog_update
 
 %preun addon-ccpp
 %systemd_preun abrt-ccpp.service
+%systemd_preun abrt-journal-core.service
 
 %post addon-kerneloops
 %systemd_post abrt-oops.service
+%journal_catalog_update
 
 %preun addon-kerneloops
 %systemd_preun abrt-oops.service
@@ -484,6 +593,12 @@ fi
 %preun addon-pstoreoops
 %systemd_preun abrt-pstoreoops.service
 
+%post addon-python
+%journal_catalog_update
+
+%post addon-python3
+%journal_catalog_update
+
 %post addon-upload-watch
 %systemd_post abrt-upload-watch.service
 
@@ -492,16 +607,46 @@ fi
 
 %post addon-vmcore
 %systemd_post abrt-vmcore.service
+%journal_catalog_update
 
 %preun addon-vmcore
 %systemd_preun abrt-vmcore.service
 
 %post addon-xorg
 %systemd_post abrt-xorg.service
+%journal_catalog_update
 
 %preun addon-xorg
 %systemd_preun abrt-xorg.service
 
+%post atomic
+if [ -f %{_sysconfdir}/%{name}/plugins/CCpp.conf ]; then
+	mv -f %{_sysconfdir}/%{name}/plugins/CCpp.conf %{_sysconfdir}/%{name}/plugins/CCpp.conf.rpmsave.atomic || exit 1
+fi
+ln -sf %{_sysconfdir}/%{name}/plugins/CCpp_Atomic.conf %{_sysconfdir}/%{name}/plugins/CCpp.conf
+if [ -f %{_datadir}/%{name}/conf.d/plugins/CCpp.conf ]; then
+	mv -f %{_datadir}/%{name}/conf.d/plugins/CCpp.conf %{_datadir}/%{name}/conf.d/plugins/CCpp.conf.rpmsave.atomic || exit 1;
+fi
+ln -sf %{_datadir}/%{name}/conf.d/plugins/CCpp_Atomic.conf %{_datadir}/%{name}/conf.d/plugins/CCpp.conf
+%systemd_post abrt-coredump-helper.service
+
+%preun atomic
+if [ -L %{_sysconfdir}/%{name}/plugins/CCpp.conf ]; then
+	rm -f %{_sysconfdir}/%{name}/plugins/CCpp.conf
+fi
+if [ -L %{_datadir}/%{name}/conf.d/plugins/CCpp.conf ]; then
+	rm -f %{_datadir}/%{name}/conf.d/plugins/CCpp.conf
+fi
+if [ -f %{_sysconfdir}/%{name}/plugins/CCpp.conf.rpmsave.atomic ]; then
+	mv -f %{_sysconfdir}/%{name}/plugins/CCpp.conf.rpmsave.atomic %{_sysconfdir}/%{name}/plugins/CCpp.conf || exit 1
+fi
+if [ -f %{_datadir}/%{name}/conf.d/plugins/CCpp.conf.rpmsave.atomic ]; then
+	mv -f %{_datadir}/%{name}/conf.d/plugins/CCpp.conf.rpmsave.atomic %{_datadir}/%{name}/conf.d/plugins/CCpp.conf || exit 1
+fi
+
+%postun atomic
+%systemd_postun_with_restart abrt-coredump-helper.service
+
 %post gui
 %update_icon_cache hicolor
 
@@ -513,19 +658,32 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README
+%doc README.md changelog
+%attr(755,root,root) %{_bindir}/abrt
+%attr(755,root,root) %{_bindir}/abrt-action-analyze-python
+%attr(755,root,root) %{_bindir}/abrt-action-notify
+%attr(755,root,root) %{_bindir}/abrt-action-save-container-data
 %attr(755,root,root) %{_bindir}/abrt-action-save-package-data
 %attr(755,root,root) %{_bindir}/abrt-handle-upload
 %attr(755,root,root) %{_bindir}/abrt-watch-log
+%attr(755,root,root) %{_sbindir}/abrt-auto-reporting
 %attr(755,root,root) %{_sbindir}/abrt-server
 %attr(755,root,root) %{_sbindir}/abrtd
+%attr(755,root,root) %{_libexecdir}/abrt-action-generate-machine-id
 %attr(755,root,root) %{_libexecdir}/abrt-action-ureport
 %attr(755,root,root) %{_libexecdir}/abrt-handle-event
+%{py_sitedir}/abrtcli
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/conf.d
+%{_datadir}/%{name}/conf.d/abrt.conf
+%{_datadir}/%{name}/conf.d/abrt-action-save-package-data.conf
+%{_datadir}/%{name}/conf.d/gpg_keys.conf
+%dir %{_datadir}/%{name}/conf.d/plugins
+%{_datadir}/augeas/lenses/abrt.aug
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/abrt.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/gpg_keys.conf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/xorg.conf
 %dir %{_sysconfdir}/%{name}/plugins
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/abrt_event.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/smart_event.conf
@@ -533,15 +691,26 @@ fi
 %{systemdunitdir}/abrtd.service
 %attr(775,root,abrt) %dir /var/cache/%{name}
 %dir /var/run/%{name}
-/usr/lib/tmpfiles.d/abrt.conf
+%{systemdtmpfilesdir}/abrt.conf
+%{_mandir}/man1/abrt.1*
+%{_mandir}/man1/abrt-action-analyze-python.1*
+%{_mandir}/man1/abrt-action-notify.1*
 %{_mandir}/man1/abrt-action-save-package-data.1*
+%{_mandir}/man1/abrt-auto-reporting.1*
 %{_mandir}/man1/abrt-handle-upload.1*
 %{_mandir}/man1/abrt-server.1*
 %{_mandir}/man1/abrt-watch-log.1*
 %{_mandir}/man5/abrt.conf.5*
 %{_mandir}/man5/abrt-action-save-package-data.conf.5*
+%{_mandir}/man5/abrt_event.conf.5*
+%{_mandir}/man5/gpg_keys.conf.5*
+%{_mandir}/man5/smart_event.conf.5*
 %{_mandir}/man8/abrtd.8*
 
+%files -n bash-completion-abrt
+%defattr(644,root,root,755)
+/etc/bash_completion.d/abrt.bash_completion
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libabrt.so.*.*.*
@@ -570,14 +739,16 @@ fi
 %attr(755,root,root) %{_bindir}/abrt-action-list-dsos
 %attr(755,root,root) %{_bindir}/abrt-action-perform-ccpp-analysis
 %attr(755,root,root) %{_bindir}/abrt-action-trim-files
-%attr(755,root,root) %{_sbindir}/abrt-install-ccpp-hook
+%attr(755,root,root) %{_bindir}/abrt-dump-journal-core
 %attr(6755,abrt,abrt) %{_libexecdir}/abrt-action-install-debuginfo-to-abrt-cache
 %attr(755,root,root) %{_libexecdir}/abrt-gdb-exploitable
-%attr(755,root,root) %{_libexecdir}/abrt-hook-ccpp
+%{_datadir}/%{name}/conf.d/plugins/CCpp.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/CCpp.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/ccpp_event.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/gconf_event.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/vimrc_event.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/plugins/catalog_ccpp_format.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/plugins/catalog_journal_ccpp_format.conf
 %attr(775,abrt,abrt) %dir %{_localstatedir}/cache/abrt-di
 #%attr(754,root,root) /etc/rc.d/init.d/abrt-ccpp
 %{_datadir}/libreport/events/analyze_CCpp.xml
@@ -588,6 +759,8 @@ fi
 %{_datadir}/libreport/events/collect_xsession_errors.xml
 %{_datadir}/libreport/events/post_report.xml
 %{systemdunitdir}/abrt-ccpp.service
+%{systemdunitdir}/abrt-journal-core.service
+%{_prefix}/lib/systemd/catalog/abrt_ccpp.catalog
 %{_mandir}/man1/abrt-action-analyze-backtrace.1*
 %{_mandir}/man1/abrt-action-analyze-c.1*
 %{_mandir}/man1/abrt-action-analyze-ccpp-local.1*
@@ -599,19 +772,40 @@ fi
 %{_mandir}/man1/abrt-action-list-dsos.1*
 %{_mandir}/man1/abrt-action-perform-ccpp-analysis.1*
 %{_mandir}/man1/abrt-action-trim-files.1*
+%{_mandir}/man1/abrt-dump-journal-core.1*
+%{_mandir}/man5/abrt-CCpp.conf.5*
+%{_mandir}/man5/ccpp_event.conf.5*
+%{_mandir}/man5/ccpp_retrace_event.conf.5*
+%{_mandir}/man5/gconf_event.conf.5*
+%{_mandir}/man5/vimrc_event.conf.5*
+
+%files addon-coredump-helper
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/abrt-install-ccpp-hook
+%attr(755,root,root) %{_libexecdir}/abrt-hook-ccpp
 %{_mandir}/man1/abrt-install-ccpp-hook.1*
 
 %files addon-kerneloops
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/abrt-action-analyze-oops
-%attr(755,root,root) %{_bindir}/abrt-action-save-kernel-data
+%attr(755,root,root) %{_bindir}/abrt-action-check-oops-for-alt-component
+%attr(755,root,root) %{_bindir}/abrt-action-check-oops-for-hw-error
+%attr(755,root,root) %{_bindir}/abrt-dump-journal-oops
 %attr(755,root,root) %{_bindir}/abrt-dump-oops
+%{_datadir}/%{name}/conf.d/plugins/oops.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/koops_event.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/plugins/catalog_koops_format.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/oops.conf
+%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.oops.xml
 #%attr(754,root,root) /etc/rc.d/init.d/abrt-oops
 %{systemdunitdir}/abrt-oops.service
+%{_prefix}/lib/systemd/catalog/abrt_koops.catalog
 %{_mandir}/man1/abrt-action-analyze-oops.1*
-%{_mandir}/man1/abrt-action-save-kernel-data.1*
+%{_mandir}/man1/abrt-action-check-oops-for-hw-error.1*
+%{_mandir}/man1/abrt-dump-journal-oops.1*
 %{_mandir}/man1/abrt-dump-oops.1*
+%{_mandir}/man5/abrt-oops.conf.5*
+%{_mandir}/man5/koops_event.conf.5*
 
 %files addon-pstoreoops
 %defattr(644,root,root,755)
@@ -624,12 +818,27 @@ fi
 
 %files addon-python
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/abrt-action-analyze-python
+%{_datadir}/%{name}/conf.d/plugins/python.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/python.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/python_event.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/plugins/catalog_python_format.conf
+%{_prefix}/lib/systemd/catalog/abrt_python.catalog
 %{py_sitedir}/abrt_exception_handler.py[co]
 %{py_sitedir}/abrt.pth
-%{_mandir}/man1/abrt-action-analyze-python.1*
+%{_mandir}/man5/abrt-python.conf.5*
+%{_mandir}/man5/python_event.conf.5*
+
+%files addon-python3
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/conf.d/plugins/python3.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/python3.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/python3_event.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf
+%{_prefix}/lib/systemd/catalog/abrt_python3.catalog
+%{py3_sitedir}/abrt_exception_handler3.py*
+%{py3_sitedir}/abrt3.pth
+%{_mandir}/man5/abrt-python3.conf.5*
+%{_mandir}/man5/python3_event.conf.5*
 
 %files addon-upload-watch
 %defattr(644,root,root,755)
@@ -641,28 +850,50 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/abrt-action-analyze-vmcore
 %attr(755,root,root) %{_sbindir}/abrt-harvest-vmcore
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/abrt-harvest-vmcore.conf
+%dir %{_datadir}/%{name}/conf.d/plugins/vmcore.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/vmcore.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/vmcore_event.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/plugins/catalog_vmcore_format.conf
 #%attr(754,root,root) /etc/rc.d/init.d/abrt-vmcore
 %{_datadir}/libreport/events/analyze_VMcore.xml
 %{systemdunitdir}/abrt-vmcore.service
+%{_prefix}/lib/systemd/catalog/abrt_vmcore.catalog
 %{_mandir}/man1/abrt-action-analyze-vmcore.1*
 %{_mandir}/man1/abrt-harvest-vmcore.1*
+%{_mandir}/man5/abrt-vmcore.conf.5*
+%{_mandir}/man5/vmcore_event.conf.5*
 
 %files addon-xorg
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/abrt-action-analyze-xorg
+%attr(755,root,root) %{_bindir}/abrt-dump-journal-xorg
 %attr(755,root,root) %{_bindir}/abrt-dump-xorg
+%dir %{_datadir}/%{name}/conf.d/plugins/xorg.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/xorg.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/xorg_event.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/plugins/catalog_xorg_format.conf
 #%attr(754,root,root) /etc/rc.d/init.d/abrt-xorg
 %{systemdunitdir}/abrt-xorg.service
+%{_prefix}/lib/systemd/catalog/abrt_xorg.catalog
 %{_mandir}/man1/abrt-action-analyze-xorg.1*
+%{_mandir}/man1/abrt-dump-journal-xorg.1*
 %{_mandir}/man1/abrt-dump-xorg.1*
 %{_mandir}/man5/abrt-xorg.conf.5*
+%{_mandir}/man5/xorg_event.conf.5*
+
+%files atomic
+%defattr(644,root,root,755)
+%{_datadir}/%{name}/conf.d/plugins/CCpp_Atomic.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/plugins/CCpp_Atomic.conf
+%{systemdunitdir}/abrt-coredump-helper.service
 
 %files plugin-bodhi
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/abrt-action-find-bodhi-update
 %attr(755,root,root) %{_bindir}/abrt-bodhi
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/bodhi_event.conf
+%{_datadir}/libreport/events/analyze_BodhiUpdates.xml
+%{_mandir}/man1/abrt-action-find-bodhi-update.1*
 %{_mandir}/man1/abrt-bodhi.1*
 
 %files retrace-client
@@ -674,12 +905,25 @@ fi
 
 %files dbus
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/abrt-configuration
 %attr(755,root,root) %{_sbindir}/abrt-dbus
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/dbus_event.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/abrt_dbus_event.conf
 /etc/dbus-1/system.d/dbus-abrt.conf
-%{_datadir}/dbus-1/interfaces/org.freedesktop.Problems.xml
+/etc/dbus-1/system.d/org.freedesktop.problems.daemon.conf
+%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.abrt.xml
+%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.ccpp.xml
+%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.python.xml
+%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.vmcore.xml
+%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xml
+%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.xorg.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Entry.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Session.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Problems2.Task.xml
+%{_datadir}/dbus-1/system-services/com.redhat.problems.configuration.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.problems.service
 %{_datadir}/polkit-1/actions/abrt_polkit.policy
+%{_mandir}/man8/abrt-configuration.8*
 %{_mandir}/man8/abrt-dbus.8*
 %{_docdir}/abrt-dbus-%{version}
 
@@ -690,6 +934,13 @@ fi
 %{py_sitedir}/problem/*.py[co]
 %{_mandir}/man5/abrt-python.5*
 
+%files python3
+%defattr(644,root,root,755)
+%dir %{py3_sitedir}/problem
+%attr(755,root,root) %{py3_sitedir}/problem/_py3abrt.so
+%{py3_sitedir}/problem/*.py*
+%{_mandir}/man5/abrt-python3.5*
+
 %files cli
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/abrt-cli
@@ -725,4 +976,4 @@ fi
 
 %files console-notification
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/profile.d/abrt-console-notification.sh
+%config(noreplace) %verify(not md5 mtime size) /etc/profile.d/abrt-console-notification.sh