[LIBREPORT PATCH rebase 1/5] move non-conf XML files from /etc/libreport/ to /usr/share/libreport/

Jakub Filak jfilak at redhat.com
Mon Jul 15 15:53:50 UTC 2013


Related to abrt/abrt#668

Signed-off-by: Jakub Filak <jfilak at redhat.com>
---
 configure.ac              | 12 +++++++-----
 libreport.spec.in         | 38 +++++++++++++++++++++-----------------
 src/plugins/Makefile.am   | 15 ++++++++++-----
 src/workflows/Makefile.am |  6 +++---
 4 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/configure.ac b/configure.ac
index da7f480..5365c2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,10 +200,11 @@ CONF_DIR='${sysconfdir}/${PACKAGE_NAME}'
 VAR_RUN='${localstatedir}/run'
 PLUGINS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/plugins'
 REPORT_PLUGINS_CONF_DIR='${sysconfdir}/libreport/plugins'
-EVENTS_DIR='${sysconfdir}/${PACKAGE_NAME}/events'
-EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d'
-WORKFLOWS_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows'
-WORKFLOWS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d'
+EVENTS_DIR='${pkgdatadir}/events'
+EVENTS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/events.d'
+EVENTS_CONF_DIR='${sysconfdir}/${PACKAGE_NAME}/events'
+WORKFLOWS_DIR='${pkgdatadir}/workflows'
+WORKFLOWS_DEFINITION_DIR='${sysconfdir}/${PACKAGE_NAME}/workflows.d'
 PLUGINS_LIB_DIR='${libdir}/${PACKAGE_NAME}'
 LIBEXEC_DIR='${libexecdir}'
 
@@ -260,13 +261,14 @@ AC_SUBST(CONF_DIR)
 AC_SUBST(VAR_RUN)
 AC_SUBST(PLUGINS_CONF_DIR)
 AC_SUBST(REPORT_PLUGINS_CONF_DIR)
+AC_SUBST(EVENTS_DEFINITION_DIR)
 AC_SUBST(EVENTS_CONF_DIR)
 AC_SUBST(EVENTS_DIR)
 AC_SUBST(PLUGINS_LIB_DIR)
 AC_SUBST(DEBUG_DUMPS_DIR)
 AC_SUBST(LIBEXEC_DIR)
 AC_SUBST(WORKFLOWS_DIR)
-AC_SUBST(WORKFLOWS_CONF_DIR)
+AC_SUBST(WORKFLOWS_DEFINITION_DIR)
 AC_SUBST(DUMP_DIR_OWNED_BY_USER)
 
 # Initialize the test suite.
diff --git a/libreport.spec.in b/libreport.spec.in
index 972b3be..2a91739 100644
--- a/libreport.spec.in
+++ b/libreport.spec.in
@@ -310,6 +310,8 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events.d/
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/events/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/events/
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/workflows/
 
 # After everything is installed, remove info dir
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
@@ -353,6 +355,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_sysconfdir}/%{name}/
 %dir %{_sysconfdir}/%{name}/events.d/
 %dir %{_sysconfdir}/%{name}/events/
+%dir %{_datadir}/%{name}/events/
+%dir %{_datadir}/%{name}/workflows/
 %dir %{_sysconfdir}/%{name}/plugins/
 
 %files devel
@@ -407,7 +411,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libexecdir}/abrt-screencast
 %{_libdir}/libreport-gtk.so.*
 %config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_EmergencyAnalysis.xml
+%{_datadir}/%{name}/events/report_EmergencyAnalysis.xml
 
 %files gtk-devel
 %defattr(-,root,root,-)
@@ -417,14 +421,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files plugin-kerneloops
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Kerneloops.xml
+%{_datadir}/%{name}/events/report_Kerneloops.xml
 %{_mandir}/man*/reporter-kerneloops.*
 %{_bindir}/reporter-kerneloops
 
 %files plugin-logger
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Logger.xml
+%{_datadir}/%{name}/events/report_Logger.xml
 %config(noreplace) %{_sysconfdir}/libreport/events.d/print_event.conf
 %{_bindir}/reporter-print
 %{_mandir}/man*/reporter-print.*
@@ -432,7 +436,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files plugin-mailx
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/libreport/plugins/mailx.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Mailx.xml
+%{_datadir}/%{name}/events/report_Mailx.xml
 %config(noreplace) %{_sysconfdir}/libreport/events.d/mailx_event.conf
 %{_mandir}/man*/reporter-mailx.*
 %{_bindir}/reporter-mailx
@@ -441,7 +445,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %{_bindir}/reporter-ureport
 #%{_mandir}/man1/reporter-ureport.1.gz
-%config(noreplace) %{_sysconfdir}/libreport/events/report_uReport.xml
+%{_datadir}/%{name}/events/report_uReport.xml
 
 %if %{with bugzilla}
 %files plugin-bugzilla
@@ -451,7 +455,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup.conf
 %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_libreport.conf
 %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_kernel.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.xml
+%{_datadir}/%{name}/events/report_Bugzilla.xml
 %config(noreplace) %{_sysconfdir}/libreport/events/report_Bugzilla.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_event.conf
 # FIXME: remove with the old gui
@@ -462,7 +466,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files plugin-rhtsupport
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/libreport/plugins/rhtsupport.conf
-%config(noreplace) %{_sysconfdir}/libreport/events/report_RHTSupport.xml
+%{_datadir}/%{name}/events/report_RHTSupport.xml
 %config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf
 %{_mandir}/man1/reporter-rhtsupport.1.gz
 %{_bindir}/reporter-rhtsupport
@@ -478,29 +482,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %{_mandir}/man*/reporter-upload.*
 %{_bindir}/reporter-upload
-%config(noreplace) %{_sysconfdir}/libreport/events/report_Uploader.xml
+%{_datadir}/%{name}/events/report_Uploader.xml
 %config(noreplace) %{_sysconfdir}/libreport/events.d/uploader_event.conf
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Upload.xml
+%{_datadir}/%{name}/workflows/workflow_Upload.xml
 
 %files fedora
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_Fedora.xml
+%{_datadir}/%{name}/workflows/workflow_Fedora.xml
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
 
 %files rhel
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELCCpp.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELKerneloops.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELPython.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELvmcore.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_RHELxorg.xml
+%{_datadir}/%{name}/workflows/workflow_RHELCCpp.xml
+%{_datadir}/%{name}/workflows/workflow_RHELKerneloops.xml
+%{_datadir}/%{name}/workflows/workflow_RHELPython.xml
+%{_datadir}/%{name}/workflows/workflow_RHELvmcore.xml
+%{_datadir}/%{name}/workflows/workflow_RHELxorg.xml
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_rhel.conf
 
 %if %{with bugzilla}
 %files anaconda
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaFedora.xml
-%config(noreplace) %{_sysconfdir}/libreport/workflows/workflow_AnacondaUpload.xml
+%{_datadir}/%{name}/workflows/workflow_AnacondaFedora.xml
+%{_datadir}/%{name}/workflows/workflow_AnacondaUpload.xml
 %config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf
 %config(noreplace) %{_sysconfdir}/libreport/events.d/bugzilla_anaconda_event.conf
 %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 4bca629..166604c 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -39,10 +39,13 @@ dist_reportpluginsconf_DATA = $(reporters_plugin_conf) \
     mailx.conf
 
 eventsdir = $(EVENTS_DIR)
+eventsconfdir = $(EVENTS_CONF_DIR)
 
 reporters_events =
+reporters_events_conf =
 if BUILD_BUGZILLA
-reporters_events += report_Bugzilla.xml report_Bugzilla.conf
+reporters_events += report_Bugzilla.xml
+reporters_events_conf += report_Bugzilla.conf
 endif
 
 if BUILD_UREPORT
@@ -50,7 +53,6 @@ reporters_events += report_uReport.xml
 endif
 
 dist_events_DATA = $(reporters_events) \
-    report_Logger.conf \
     report_Logger.xml \
     report_Mailx.xml \
     report_RHTSupport.xml \
@@ -58,11 +60,14 @@ dist_events_DATA = $(reporters_events) \
     report_Uploader.xml \
     report_EmergencyAnalysis.xml
 
+dist_eventsconf_DATA = $(reporters_events_conf) \
+    report_Logger.conf
+
 @INTLTOOL_XML_RULE@
 
-eventsconfdir = $(EVENTS_CONF_DIR)
+eventsdefdir = $(EVENTS_DEFINITION_DIR)
 
-dist_eventsconf_DATA = \
+dist_eventsdef_DATA = \
     mailx_event.conf \
     print_event.conf \
     rhtsupport_event.conf \
@@ -71,7 +76,7 @@ dist_eventsconf_DATA = \
 
 reporters_extra_dist =
 if BUILD_BUGZILLA
-dist_eventsconf_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf
+dist_eventsdef_DATA += bugzilla_event.conf bugzilla_anaconda_event.conf
 reporters_extra_dist += report_Bugzilla.xml.in report_Bugzilla.conf
 endif
 
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am
index 45ba7e0..9e53c8c 100644
--- a/src/workflows/Makefile.am
+++ b/src/workflows/Makefile.am
@@ -15,14 +15,14 @@ dist_workflows_DATA += \
     workflow_AnacondaUpload.xml
 endif
 
-workflowsconfdir = $(WORKFLOWS_CONF_DIR)
+workflowsdefdir = $(WORKFLOWS_DEFINITION_DIR)
 
-dist_workflowsconf_DATA =\
+dist_workflowsdef_DATA =\
     report_fedora.conf \
     report_rhel.conf
 
 if BUILD_BUGZILLA
-dist_workflowsconf_DATA += \
+dist_workflowsdef_DATA += \
     anaconda_event.conf
 endif
 
-- 
1.8.3.1



More information about the Crash-catcher mailing list