From cf2b3c3c0d5d28afc8a963514507bf2a14df2d7b Mon Sep 17 00:00:00 2001
From: Jiri <moskovcak@gmail.com>
Date: Mon, 26 Mar 2012 16:18:51 +0200
Subject: [PATCH] new upstream version 2.0.9

---
 .gitignore |   1 +
 abrt.spec  | 194 ++++++++++++++++++++++++++++++++++++++---------------
 sources    |   2 +-
 3 files changed, 143 insertions(+), 54 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d554c3..0323266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ abrt-1.1.13.tar.gz
 /abrt-2.0.4.tar.gz
 /abrt-2.0.6.tar.gz
 /abrt-2.0.7.tar.gz
+/abrt-2.0.9.tar.gz
diff --git a/abrt.spec b/abrt.spec
index 1fceace..55d3e29 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -16,7 +16,6 @@
     %endif
 %endif
 
-
 %if 0%{?rhel} >= 6
 %define vendor redhat
 %else
@@ -25,23 +24,16 @@
 
 Summary: Automatic bug detection and reporting tool
 Name: abrt
-Version: 2.0.7
-Release: 7%{?dist}
+Version: 2.0.9
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
 Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz
 Source1: abrt1_to_abrt2
-Patch0: blacklist.patch
-Patch1: abrt_disable_gpgcheck.diff
-Patch2: 0002-disabled-reporting-to-kerneloops.org.patch
-Patch3: 0003-abrtd-fix-potential-problem-with-exitcode-check-on-p.patch
-Patch4: 0004-abrtd-always-explain-why-we-delete-corrupted-dir.-Cl.patch
-Patch5: 0005-more-glib2.31-fixes.patch
-Patch6: 0006-missed-one-more-deprecated-g_io_channel_read.patch
-Patch7: 0007-abrt-action-install-debuginfo-do-not-use-scientific-.patch
-Patch8: 0008-abrt-cli-add-man-page.-Closes-rhbz-747624.patch
-Patch9: abrt-rhelkeys.patch
+Patch0: abrt-rhelkeys.patch
+Patch1: blacklist.patch
+Patch2: abrt_disable_gpgcheck.diff
 BuildRequires: dbus-devel
 BuildRequires: gtk2-devel
 BuildRequires: rpm-devel >= 4.6
@@ -58,6 +50,9 @@ BuildRequires: asciidoc
 BuildRequires: xmlto
 BuildRequires: libreport-devel > 2.0.6
 BuildRequires: btparser-devel
+BuildRequires: elfutils-devel
+BuildRequires: elfutils-libelf-devel
+BuildRequires: binutils-devel
 
 %if %{with systemd}
 Requires: systemd-units
@@ -107,7 +102,8 @@ GTK+ wizard for convenient bug reporting.
 %package addon-ccpp
 Summary: %{name}'s C/C++ addon
 Group: System Environment/Libraries
-Requires: elfutils, cpio
+Requires: elfutils, elfutils-libelf, elfutils-libs, cpio
+Requires: gdb >= 7.0-3
 Requires: %{name} = %{version}-%{release}
 
 %description addon-ccpp
@@ -134,15 +130,24 @@ Obsoletes: kerneloops > 0.0.1
 Obsoletes: abrt-plugin-kerneloops > 0.0.1
 Obsoletes: abrt-plugin-kerneloopsreporter > 0.0.1
 
+%description addon-kerneloops
+This package contains plugin for collecting kernel crash information from system log.
+
+%package addon-xorg
+Summary: %{name}'s Xorg addon
+Group: System Environment/Libraries
+Requires: curl
+Requires: %{name} = %{version}-%{release}
+
+%description addon-xorg
+This package contains plugin for collecting Xorg crash information from Xorg log.
+
 %package addon-vmcore
 Summary: %{name}'s vmcore addon
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: abrt-addon-kerneloops
 
-%description addon-kerneloops
-This package contains plugin for collecting kernel crash information from system log.
-
 %description addon-vmcore
 This package contains plugin for collecting kernel crash information from vmcore files.
 
@@ -158,18 +163,26 @@ Provides: gnome-python2-bugbuddy
 This package contains python hook and python analyzer plugin for handling
 uncaught exception in python programs.
 
-%package cli
+%package tui
 Summary: %{name}'s command line interface
 Group: User Interface/Desktops
+
+%description tui
+This package contains simple command line client for processing abrt reports in
+command line environment
+
+%package cli
+Summary: Virtual package to install all necessary packages for usage from command line environment
+Group: Applications/System
 Requires: %{name} = %{version}-%{release}
+Requires: abrt-tui
 Requires: libreport-cli
 Requires: abrt-addon-kerneloops
 Requires: abrt-addon-ccpp, abrt-addon-python
 Requires: libreport-plugin-bugzilla, libreport-plugin-logger
 
 %description cli
-This package contains simple command line client for controlling abrt daemon over
-the sockets.
+Virtual package to make easy default installation on non-graphical environments.
 
 %package desktop
 Summary: Virtual package to install all necessary packages for usage from desktop environment
@@ -188,33 +201,37 @@ Requires: abrt-addon-python
 Requires: gdb >= 7.0-3
 Requires: abrt-gui
 Requires: libreport-plugin-logger, libreport-plugin-bugzilla
-Requires: abrt-retrace-client
+#Requires: abrt-plugin-firefox
 %if 0%{?fedora}
 Requires: libreport-plugin-bodhi
 %endif
-#Requires: abrt-plugin-firefox
 Obsoletes: bug-buddy > 0.0.1
 Provides: bug-buddy
 
 %description desktop
 Virtual package to make easy default installation on desktop environments.
 
+%package dbus
+Summary: ABRT DBus service
+Group: Application/System
+Requires: %{name} = %{version}-%{release}
+Requires: libreport
+BuildRequires: polkit-devel
+
+%description dbus
+ABRT DBus service which provides org.freedesktop.problems API on dbus and
+uses PolicyKit to authorize to access the problem data.
+
+
 %prep
 %setup -q
-# Fedora specific
-%patch0 -p1 -b .blacklist
-# general
-%patch1 -p1 -b .gpg
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+#RHEL
 %if 0%{?rhel} >= 7
-    %patch9 -p1
+    %patch0 -p1 -b .rhel_gpg
 %endif
+#Fedora
+%patch1 -p1 -b .blacklist
+%patch2 -p1 -b .gpgcheck
 
 %build
 autoconf
@@ -229,7 +246,6 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
 
 # remove all .la and .a files
 find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
-install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_libexecdir}/abrt1-to-abrt2
 mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di
 mkdir -p $RPM_BUILD_ROOT/var/run/abrt
@@ -263,6 +279,7 @@ getent passwd abrt >/dev/null || useradd --system -g abrt -u %{abrt_gid_uid} -d
 exit 0
 
 %post
+# $1 == 1 if install; 2 if upgrade
 if [ $1 -eq 1 ]; then
 %if %{with systemd}
     # Enable (but don't start) the units by default
@@ -271,7 +288,6 @@ if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add abrtd
 %endif
 fi
-%{_libexecdir}/abrt1-to-abrt2 || :
 
 %post addon-ccpp
 # this is required for transition from 1.1.x to 2.x
@@ -279,31 +295,64 @@ fi
 # so 2.x fails when it tries to extract debuginfo there..
 chown -R abrt:abrt %{_localstatedir}/cache/abrt-di
 if [ $1 -eq 1 ]; then
+    # We are installing this package, we aren't upgrading it.
+    # Probably the system had old abrt, one without abrt-ccpp package.
+    # If this old abrtd was enabled, then the new package
+    # should have abrt-ccpp enabled too.
 %if %{with systemd}
-    # Enable (but don't start) the units by default
-    /bin/systemctl enable abrt-ccpp.service >/dev/null 2>&1 || :
+    if [ "`/bin/systemctl is-enabled abrtd.service`" = "enabled" ]; then
+        # Enable (but don't start) the units by default
+        /bin/systemctl enable abrt-ccpp.service >/dev/null 2>&1 || :
+    fi
 %else
-    /sbin/chkconfig --add abrt-ccpp
+    if /sbin/chkconfig abrtd >/dev/null 2>&1; then
+        /sbin/chkconfig --add abrt-ccpp
+    fi
 %endif
 fi
 
 %post addon-kerneloops
 if [ $1 -eq 1 ]; then
+    # (see explanation in addon-ccpp section)
 %if %{with systemd}
-    # Enable (but don't start) the units by default
-    /bin/systemctl enable abrt-oops.service >/dev/null 2>&1 || :
+    if [ "`/bin/systemctl is-enabled abrtd.service`" = "enabled" ]; then
+        # Enable (but don't start) the units by default
+        /bin/systemctl enable abrt-oops.service >/dev/null 2>&1 || :
+    fi
 %else
-    /sbin/chkconfig --add abrt-oops
+    if /sbin/chkconfig abrtd >/dev/null 2>&1; then
+        /sbin/chkconfig --add abrt-oops
+    fi
+%endif
+fi
+
+%post addon-xorg
+if [ $1 -eq 1 ]; then
+    # (see explanation in addon-ccpp section)
+%if %{with systemd}
+    if [ "`/bin/systemctl is-enabled abrtd.service`" = "enabled" ]; then
+        # Enable (but don't start) the units by default
+        /bin/systemctl enable abrt-xorg.service >/dev/null 2>&1 || :
+    fi
+%else
+    if /sbin/chkconfig abrtd >/dev/null 2>&1; then
+        /sbin/chkconfig --add abrt-xorg
+    fi
 %endif
 fi
 
 %post addon-vmcore
 if [ $1 -eq 1 ]; then
+    # (see explanation in addon-ccpp section)
 %if %{with systemd}
-    # Enable (but don't start) the units by default
-    /bin/systemctl enable abrt-vmcore.service >/dev/null 2>&1 || :
+    if [ "`/bin/systemctl is-enabled abrtd.service`" = "enabled" ]; then
+        # Enable (but don't start) the units by default
+        /bin/systemctl enable abrt-vmcore.service >/dev/null 2>&1 || :
+    fi
 %else
-    /sbin/chkconfig --add abrt-vmcore
+    if /sbin/chkconfig abrtd >/dev/null 2>&1; then
+        /sbin/chkconfig --add abrt-vmcore
+    fi
 %endif
 fi
 
@@ -340,6 +389,17 @@ if [ "$1" -eq "0" ] ; then
 %endif
 fi
 
+%preun addon-xorg
+if [ "$1" -eq "0" ] ; then
+%if %{with systemd}
+    /bin/systemctl --no-reload abrt-xorg.service >/dev/null 2>&1 || :
+    /bin/systemctl stop abrt-xorg.service >/dev/null 2>&1 || :
+%else
+    service abrt-xorg stop >/dev/null 2>&1
+    /sbin/chkconfig --del abrt-xorg
+%endif
+fi
+
 %preun addon-vmcore
 if [ "$1" -eq "0" ] ; then
 %if %{with systemd}
@@ -358,6 +418,9 @@ fi
 %postun addon-kerneloops
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
+%postun addon-xorg
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
 %postun addon-vmcore
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
@@ -389,6 +452,9 @@ service abrt-ccpp condrestart >/dev/null 2>&1 || :
 %posttrans addon-kerneloops
 service abrt-oops condrestart >/dev/null 2>&1 || :
 
+%posttrans addon-xorg
+service abrt-xorg condrestart >/dev/null 2>&1 || :
+
 %posttrans addon-vmcore
 service abrt-vmcore condrestart >/dev/null 2>&1 || :
 
@@ -399,21 +465,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %doc README COPYING
 %if %{with systemd}
-/lib/systemd/system/abrtd.service
+%{_unitdir}/abrtd.service
 %else
 %{_initrddir}/abrtd
 %endif
 %{_sbindir}/abrtd
-%{_sbindir}/abrt-dbus
 %{_sbindir}/abrt-server
 %{_libexecdir}/abrt-handle-event
 %{_bindir}/abrt-handle-upload
 %{_bindir}/abrt-action-save-package-data
+%{_bindir}/abrt-watch-log
 %config(noreplace) %{_sysconfdir}/%{name}/abrt.conf
 %config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf
 %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys
 %config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/smolt_event.conf
 %dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name}
@@ -434,8 +499,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/abrt.conf.5.gz
 %{_mandir}/man5/abrt-action-save-package-data.conf.5.gz
 # {_mandir}/man5/pyhook.conf.5.gz
-%{_datadir}/dbus-1/system-services/com.redhat.abrt.service
-%{_libexecdir}/abrt1-to-abrt2
 
 %files libs
 %defattr(-,root,root,-)
@@ -466,7 +529,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf
 %dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di
 %if %{with systemd}
-/lib/systemd/system/abrt-ccpp.service
+%{_unitdir}/abrt-ccpp.service
 %else
 %{_initrddir}/abrt-ccpp
 %endif
@@ -477,8 +540,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/abrt-action-analyze-core
 %{_bindir}/abrt-action-install-debuginfo
 %{_bindir}/abrt-action-generate-backtrace
+%{_bindir}/abrt-action-generate-core-backtrace
 %{_bindir}/abrt-action-analyze-backtrace
 %{_bindir}/abrt-action-list-dsos
+%{_bindir}/abrt-dedup-client
 %{_sbindir}/abrt-install-ccpp-hook
 %{_sysconfdir}/libreport/events.d/ccpp_event.conf
 %{_sysconfdir}/libreport/events.d/gconf_event.conf
@@ -492,6 +557,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man*/abrt-action-analyze-c.*
 %{_mandir}/man*/abrt-action-trim-files.*
 %{_mandir}/man*/abrt-action-generate-backtrace.*
+%{_mandir}/man*/abrt-action-generate-core-backtrace.*
 %{_mandir}/man*/abrt-action-analyze-backtrace.*
 %{_mandir}/man*/abrt-action-list-dsos.*
 %{_mandir}/man1/abrt-install-ccpp-hook.1.gz
@@ -506,7 +572,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/libreport/events.d/koops_event.conf
 %if %{with systemd}
-/lib/systemd/system/abrt-oops.service
+%{_unitdir}/abrt-oops.service
 %else
 %{_initrddir}/abrt-oops
 %endif
@@ -514,17 +580,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/abrt-action-analyze-oops
 %{_mandir}/man1/abrt-action-analyze-oops.1*
 
+%files addon-xorg
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/libreport/events.d/xorg_event.conf
+%if %{with systemd}
+%{_unitdir}/abrt-xorg.service
+%else
+%{_initrddir}/abrt-xorg
+%endif
+%{_bindir}/abrt-dump-xorg
+###%{_mandir}/man1/abrt-dump-xorg.1*
+
 %files addon-vmcore
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf
 %{_sysconfdir}/libreport/events/analyze_VMcore.xml
 %if %{with systemd}
-/lib/systemd/system/abrt-vmcore.service
+%{_unitdir}/abrt-vmcore.service
 %else
 %{_initrddir}/abrt-vmcore
 %endif
 %{_sbindir}/abrt-harvest-vmcore
 %{_bindir}/abrt-action-analyze-vmcore
+%{_mandir}/man1/abrt-action-analyze-vmcore.1*
 
 %files addon-python
 %defattr(-,root,root,-)
@@ -537,12 +615,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files cli
 %defattr(-,root,root,-)
+
+%files tui
+%defattr(-,root,root,-)
 %{_bindir}/abrt-cli
 %{_mandir}/man1/abrt-cli.1.gz
 
 %files desktop
 %defattr(-,root,root,-)
 
+%files dbus
+%defattr(-,root,root,-)
+%{_sbindir}/abrt-dbus
+%config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.problems.service
+%{_datadir}/polkit-1/actions/abrt_polkit.policy
+
 %changelog
 * Mon Mar 19 2012 Jiri Moskovcak <jmoskovc@redhat.com> 2.0.7-7
 - fixed problems with rhel gpg keys rhbz#800419
diff --git a/sources b/sources
index acd8d07..ae25664 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c507dd1f962f8bffca4873a37c6a932  abrt-2.0.7.tar.gz
+29598a2d5851ed820b1b5b030b8e9a42  abrt-2.0.9.tar.gz