- this one can't be applied to the latest HEAD
On 03/14/2013 03:50 PM, Michal Toman wrote:
---
configure.ac | 8 ++++----
doc/Makefile.am | 2 +-
libreport.spec.in | 8 ++++++++
src/plugins/Makefile.am | 9 ++++++---
src/workflows/Makefile.am | 21 ++++++++++++++++-----
5 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index aae8964..cafd940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,8 +105,8 @@ XMLRPC_CLIENT_LIBS=`xmlrpc-c-config client --libs 2> /dev/null`
AC_SUBST(XMLRPC_CLIENT_CFLAGS)
AC_SUBST(XMLRPC_CLIENT_LIBS)
-# enable bugzilla translations
-for FILE in `grep "#.*ugzilla.*" po/POTFILES.in`
+# enable bugzilla & deps translations
+for FILE in `grep -e "#.*ugzilla.*" -e "#.*naconda.*"
po/POTFILES.in`
do
sed -ie "s,$FILE,${FILE:1}," po/POTFILES.in
sed -ie "\,^${FILE:1}$,d" po/POTFILES.skip
@@ -114,8 +114,8 @@ done
else
AM_CONDITIONAL(BUILD_BUGZILLA, false)
-# disablie bugzilla translations
-for FILE in `grep "ugzilla" po/POTFILES.in`
+# disablie bugzilla & deps translations
+for FILE in `grep -e "ugzilla" -e "naconda" po/POTFILES.in`
do
if test "${FILE:0:1}" = "#"
then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fc5241d..b52a043 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -12,6 +12,7 @@ MAN1_TXT += report-cli.txt
if BUILD_BUGZILLA
MAN1_TXT += reporter-bugzilla.txt
+MAN1_TXT += report.txt
endif
MAN1_TXT += reporter-kerneloops.txt
@@ -19,7 +20,6 @@ MAN1_TXT += reporter-mailx.txt
MAN1_TXT += reporter-print.txt
MAN1_TXT += reporter-rhtsupport.txt
MAN1_TXT += reporter-upload.txt
-MAN1_TXT += report.txt
MAN5_TXT =
MAN5_TXT += report_event.conf.txt
diff --git a/libreport.spec.in b/libreport.spec.in
index a892caf..619d695 100644
--- a/libreport.spec.in
+++ b/libreport.spec.in
@@ -215,6 +215,7 @@ Obsoletes: abrt-plugin-rhtsupport < 2.0.4
%description plugin-rhtsupport
Plugin to report bugs into RH support system.
+%if %{with bugzilla}
%package compat
Summary: %{name}'s compat layer for obsoleted 'report' package
Group: System Environment/Libraries
@@ -224,6 +225,7 @@ Requires: %{name}-plugin-rhtsupport = %{version}-%{release}
%description compat
Provides 'report' command-line tool.
+%endif
%package plugin-reportuploader
Summary: %{name}'s reportuploader plugin
@@ -251,6 +253,7 @@ Default configuration for reporting bugs via Fedora infrastructure
used to easy configure the reporting process for Fedora sytems. Just
install this package and you're done.
+%if %{with bugzilla}
%package anaconda
Summary: Default configuration for reporting anaconda bugs
Group: Applications/File
@@ -261,6 +264,7 @@ Requires: libreport-plugin-bugzilla
Default configuration for reporting Anaconda problems using Fedora
infrastructure or uploading the gathered data over ftp/scp...
+%endif
%prep
%setup -q
@@ -448,10 +452,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
|| :
%{_mandir}/man1/reporter-rhtsupport.1.gz
%{_bindir}/reporter-rhtsupport
+%if %{with bugzilla}
%files compat
%defattr(-,root,root,-)
%{_bindir}/report
%{_mandir}/man1/report.1.gz
+%endif
%files plugin-reportuploader
%defattr(-,root,root,-)
@@ -466,11 +472,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
|| :
%{_sysconfdir}/libreport/workflows/workflow_Fedora.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/report_fedora.conf
+%if %{with bugzilla}
%files anaconda
%defattr(-,root,root,-)
%{_sysconfdir}/libreport/workflows/workflow_AnacondaFedora.xml
%{_sysconfdir}/libreport/workflows/workflow_AnacondaUpload.xml
%config(noreplace) %{_sysconfdir}/libreport/workflows.d/anaconda_event.conf
+%endif
%changelog
* Thu Feb 07 2013 Jakub Filak <jfilak(a)redhat.com> 2.1.1-1
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index bd2116a..2b3d4f6 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -2,7 +2,9 @@ pluginslibdir = $(PLUGINS_LIB_DIR)
reporters_bin =
if BUILD_BUGZILLA
-reporters_bin += reporter-bugzilla
+reporters_bin += \
+ reporter-bugzilla \
+ report
endif
if BUILD_UREPORT
@@ -14,8 +16,7 @@ bin_PROGRAMS = $(reporters_bin) \
reporter-kerneloops \
reporter-upload \
reporter-mailx \
- reporter-print \
- report
+ reporter-print
pluginsconfdir = $(PLUGINS_CONF_DIR)
@@ -218,6 +219,7 @@ reporter_print_CPPFLAGS = \
reporter_print_LDADD = \
../lib/libreport.la
+if BUILD_BUGZILLA
report_SOURCES = \
report.c
report_CPPFLAGS = \
@@ -235,6 +237,7 @@ report_CPPFLAGS = \
-D_GNU_SOURCE
report_LDADD = \
../lib/libreport.la
+endif
if BUILD_UREPORT
reporter_ureport_SOURCES = \
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am
index 82b65ad..a3315e0 100644
--- a/src/workflows/Makefile.am
+++ b/src/workflows/Makefile.am
@@ -2,21 +2,32 @@ workflowsdir = $(WORKFLOWS_DIR)
dist_workflows_DATA = \
workflow_Fedora.xml \
- workflow_Upload.xml \
+ workflow_Upload.xml
+
+if BUILD_BUGZILLA
+dist_workflows_DATA += \
workflow_AnacondaFedora.xml \
workflow_AnacondaUpload.xml
+endif
workflowsconfdir = $(WORKFLOWS_CONF_DIR)
-dist_workflowsconf_DATA =\
- report_fedora.conf \
+dist_workflowsconf_DATA = \
+ report_fedora.conf
+
+if BUILD_BUGZILLA
+dist_workflowsconf_DATA += \
anaconda_event.conf
+endif
@INTLTOOL_XML_RULE@
EXTRA_DIST = \
workflow_Fedora.xml.in \
- workflow_Upload.xml.in \
+ workflow_Upload.xml.in
+
+if BUILD_BUGZILLA
+EXTRA_DIST += \
workflow_AnacondaFedora.xml.in \
workflow_AnacondaUpload.xml.in
-
+endif