enable plugins unconditionally rhbz#819113
This commit is contained in:
Jiri Moskovcak
parent
5079c04985
commit
43894a7cdb
20
abrt.spec
20
abrt.spec
@ -25,7 +25,7 @@
|
||||
Summary: Automatic bug detection and reporting tool
|
||||
Name: abrt
|
||||
Version: 2.0.10
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
URL: https://fedorahosted.org/abrt/
|
||||
@ -38,6 +38,7 @@ Patch3: 0002-gui-fixed-crash-when-chowning-directory-using-dbus-c.patch
|
||||
Patch4: 0003-dbus-use-the-helper-dir_accessible_by_uid-more-consi.patch
|
||||
Patch5: 0001-a-a-analyze-core-check-the-len-if-the-line-array-bef.patch
|
||||
Patch6: 0001-pyhook-add-timetout-to-sockets-rhbz-808562.patch
|
||||
Patch7: abrt_systemd_requisite.patch
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: rpm-devel >= 4.6
|
||||
@ -239,7 +240,9 @@ uses PolicyKit to authorize to access the problem data.
|
||||
%patch2 -p1 -b .gpgcheck
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1 -b .rhbz804309
|
||||
%patch5 -p1 -b .rhbz804309
|
||||
%patch6 -p1 -b .socket_timeouts
|
||||
%patch7 -p1 -b .systemd_requisit
|
||||
|
||||
%build
|
||||
autoconf
|
||||
@ -308,10 +311,8 @@ if [ $1 -eq 1 ]; then
|
||||
# If this old abrtd was enabled, then the new package
|
||||
# should have abrt-ccpp enabled too.
|
||||
%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-ccpp.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%else
|
||||
if /sbin/chkconfig abrtd >/dev/null 2>&1; then
|
||||
/sbin/chkconfig --add abrt-ccpp
|
||||
@ -323,10 +324,8 @@ fi
|
||||
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-oops.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%else
|
||||
if /sbin/chkconfig abrtd >/dev/null 2>&1; then
|
||||
/sbin/chkconfig --add abrt-oops
|
||||
@ -338,10 +337,8 @@ fi
|
||||
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
|
||||
@ -353,10 +350,8 @@ fi
|
||||
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-vmcore.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
%else
|
||||
if /sbin/chkconfig abrtd >/dev/null 2>&1; then
|
||||
/sbin/chkconfig --add abrt-vmcore
|
||||
@ -640,7 +635,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_datadir}/polkit-1/actions/abrt_polkit.policy
|
||||
|
||||
%changelog
|
||||
* Wed Apr 18 2012 Jiri Moskovcak <jmoskovc@redhat.com> 2.0.10-3
|
||||
* Thu May 10 2012 Jiri Moskovcak <jmoskovc@redhat.com> 2.0.10-3
|
||||
- enable plugins unconditionally rhbz#819113
|
||||
|
||||
* Wed Apr 18 2012 Jiri Moskovcak <jmoskovc@redhat.com>
|
||||
- fixed freeze in crashing python apps rhbz#808562
|
||||
- Resolves: #808562
|
||||
|
||||
|
||||
48
abrt_systemd_requisite.patch
Normal file
48
abrt_systemd_requisite.patch
Normal file
@ -0,0 +1,48 @@
|
||||
diff -urp abrt-2.0.10/init-scripts/abrt-ccpp.service abrt-2.0.10_systemd/init-scripts/abrt-ccpp.service
|
||||
--- abrt-2.0.10/init-scripts/abrt-ccpp.service 2012-03-08 11:20:16.000000000 +0100
|
||||
+++ abrt-2.0.10_systemd/init-scripts/abrt-ccpp.service 2012-05-10 10:27:13.596516564 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Install ABRT coredump hook
|
||||
After=abrtd.service
|
||||
-Requires=abrtd.service
|
||||
+Requisite=abrtd.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
diff -urp abrt-2.0.10/init-scripts/abrt-oops.service abrt-2.0.10_systemd/init-scripts/abrt-oops.service
|
||||
--- abrt-2.0.10/init-scripts/abrt-oops.service 2012-03-23 14:34:00.000000000 +0100
|
||||
+++ abrt-2.0.10_systemd/init-scripts/abrt-oops.service 2012-05-10 10:27:34.428515140 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=ABRT kernel log watcher
|
||||
After=abrtd.service
|
||||
-Requires=abrtd.service
|
||||
+Requisite=abrtd.service
|
||||
|
||||
[Service]
|
||||
# TODO: do we really need absolute paths here?
|
||||
diff -urp abrt-2.0.10/init-scripts/abrt-vmcore.service abrt-2.0.10_systemd/init-scripts/abrt-vmcore.service
|
||||
--- abrt-2.0.10/init-scripts/abrt-vmcore.service 2012-03-08 11:20:16.000000000 +0100
|
||||
+++ abrt-2.0.10_systemd/init-scripts/abrt-vmcore.service 2012-05-10 10:27:41.644514646 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=Harvest vmcores for ABRT
|
||||
After=abrtd.service
|
||||
-Requires=abrtd.service
|
||||
+Requisite=abrtd.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
diff -urp abrt-2.0.10/init-scripts/abrt-xorg.service abrt-2.0.10_systemd/init-scripts/abrt-xorg.service
|
||||
--- abrt-2.0.10/init-scripts/abrt-xorg.service 2012-03-23 14:34:00.000000000 +0100
|
||||
+++ abrt-2.0.10_systemd/init-scripts/abrt-xorg.service 2012-05-10 10:27:48.444514182 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
[Unit]
|
||||
Description=ABRT Xorg log watcher
|
||||
After=abrtd.service
|
||||
-Requires=abrtd.service
|
||||
+Requisite=abrtd.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/bin/sh -c 'exec /usr/bin/abrt-watch-log -F "`/usr/bin/abrt-dump-xorg -m`" /var/log/Xorg.0.log -- /usr/bin/abrt-dump-xorg -xD'
|
||||
Loading…
Reference in New Issue
Block a user