[ABRT PATCH rebase 1/6] move event option XML files to /usr/share/libreport/

Jakub Filak jfilak at redhat.com
Mon Jul 15 15:54:42 UTC 2013


Closes #668

Signed-off-by: Jakub Filak <jfilak at redhat.com>
---
 abrt.spec.in | 18 +++++++++---------
 configure.ac |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/abrt.spec.in b/abrt.spec.in
index 7bf9349..033622c 100644
--- a/abrt.spec.in
+++ b/abrt.spec.in
@@ -698,13 +698,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_event.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/gconf_event.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/analyze_CCpp.xml
-%config(noreplace) %{_sysconfdir}/libreport/events/analyze_LocalGDB.xml
-%config(noreplace) %{_sysconfdir}/libreport/events/collect_xsession_errors.xml
-%config(noreplace) %{_sysconfdir}/libreport/events/collect_GConf.xml
-%config(noreplace) %{_sysconfdir}/libreport/events/collect_vimrc_user.xml
-%config(noreplace) %{_sysconfdir}/libreport/events/collect_vimrc_system.xml
-%config(noreplace) %{_sysconfdir}/libreport/events/post_report.xml
+%{_datadir}/libreport/events/analyze_CCpp.xml
+%{_datadir}/libreport/events/analyze_LocalGDB.xml
+%{_datadir}/libreport/events/collect_xsession_errors.xml
+%{_datadir}/libreport/events/collect_GConf.xml
+%{_datadir}/libreport/events/collect_vimrc_user.xml
+%{_datadir}/libreport/events/collect_vimrc_system.xml
+%{_datadir}/libreport/events/post_report.xml
 %{_mandir}/man*/abrt-action-analyze-c.*
 %{_mandir}/man*/abrt-action-trim-files.*
 %{_mandir}/man*/abrt-action-generate-backtrace.*
@@ -717,7 +717,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/abrt-retrace-client
 %{_mandir}/man1/abrt-retrace-client.1.gz
 %config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/analyze_RetraceServer.xml
+%{_datadir}/libreport/events/analyze_RetraceServer.xml
 
 %files addon-kerneloops
 %defattr(-,root,root,-)
@@ -746,7 +746,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf
 %config(noreplace) %{_sysconfdir}/%{name}/abrt-harvest-vmcore.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/analyze_VMcore.xml
+%{_datadir}/libreport/events/analyze_VMcore.xml
 %if %{with systemd}
 %{_unitdir}/abrt-vmcore.service
 %else
diff --git a/configure.ac b/configure.ac
index 7b32618..4e69519 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,7 @@ AC_CHECK_HEADERS([locale.h])
 CONF_DIR='${sysconfdir}/${PACKAGE_NAME}'
 VAR_RUN='${localstatedir}/run'
 PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins'
-EVENTS_DIR='${sysconfdir}/libreport/events'
+EVENTS_DIR='${datadir}/libreport/events'
 EVENTS_CONF_DIR='${sysconfdir}/libreport/events.d'
 ENABLE_SOCKET_OR_DBUS='-DENABLE_DBUS=1'
 DEFAULT_DUMP_DIR_MODE=$($PKG_CONFIG --variable=dd_mode libreport)
-- 
1.8.3.1



More information about the Crash-catcher mailing list