summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Moskovcak <jmoskovc@redhat.com>2011-06-10 14:53:33 +0200
committerJiri Moskovcak <jmoskovc@redhat.com>2011-06-10 14:53:33 +0200
commitae3d2f1e79fb0582cb216ab6d2d7952323a547cd (patch)
treedd8fc36f72243492dc259be2b22b15378d199de7
parent611effbaaf4ea10260084dfec5e652e5a9496726 (diff)
downloadabrt-ae3d2f1e79fb0582cb216ab6d2d7952323a547cd.zip
abrt-ae3d2f1e79fb0582cb216ab6d2d7952323a547cd.tar.gz
abrt-ae3d2f1e79fb0582cb216ab6d2d7952323a547cd.tar.xz
move abrt_event.conf to {_sysconfigdir/abrt/events.d/
- this should fix the problem with transition to separate libreport which uses report_event.conf and contains #include events.d/*.conf
-rw-r--r--abrt.spec.in2
-rw-r--r--src/daemon/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/abrt.spec.in b/abrt.spec.in
index 2340a1e..8f9b75b 100644
--- a/abrt.spec.in
+++ b/abrt.spec.in
@@ -376,8 +376,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/abrt-action-save-package-data
%{_bindir}/abrt-retrace-client
%config(noreplace) %{_sysconfdir}/%{name}/abrt.conf
-%config(noreplace) %{_sysconfdir}/%{name}/abrt_event.conf
%config(noreplace) %{_sysconfdir}/%{name}/gpg_keys
+%config(noreplace) %{_sysconfdir}/%{name}/events.d/abrt_event.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf
%{_sysconfdir}/%{name}/events.d/smart_event.conf
%dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name}
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 58b9b2d..0a00c25 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,7 +1,8 @@
eventsconfdir = $(EVENTS_CONF_DIR)
dist_eventsconf_DATA = \
- smart_event.conf
+ smart_event.conf \
+ abrt_event.conf
bin_SCRIPTS = \
abrt-handle-upload
@@ -88,7 +89,6 @@ dist_dbusabrtconf_DATA = dbus-abrt.conf
daemonconfdir = $(CONF_DIR)
dist_daemonconf_DATA = \
abrt.conf \
- abrt_event.conf \
gpg_keys
comredhatabrtservicedir = ${datadir}/dbus-1/system-services