rpms / libreport

Clone
Source Code
GIT

Blame 0004-do-not-build-or-install-BZ-dependencies-when-without.patch

f15 f16 f17 f18 f19 f20 f21 f22 f23 f24 f25 f26 f27 f28 f29 f30 f31 f32 f33 main rawhide
  1.   af7f62575fc0a085fe131acd6631add7cef3f4f5
  2.   0004-do-not-build-or-install-BZ-dependencies-when-without.patch
Blob History Raw
Jakub Filak eaf24d6 
From 96f766fbf741ebef67d9ef3aa9256f9e94bd24be Mon Sep 17 00:00:00 2001
Jakub Filak eaf24d6 
From: Michal Toman <mtoman@redhat.com>
Jakub Filak eaf24d6 
Date: Fri, 26 Apr 2013 09:20:35 +0200
Jakub Filak eaf24d6 
Subject: [LIBREPORT PATCH 4/6] do not build or install BZ dependencies when
Jakub Filak eaf24d6 
 --without-bugzilla
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
Signed-off-by: Michal Toman <mtoman@redhat.com>
Jakub Filak eaf24d6 
Signed-off-by: Jiri Moskovcak <jmoskovc@redhat.com>
Jakub Filak eaf24d6 
---
Jakub Filak eaf24d6 
 configure.ac              |  8 ++++----
Jakub Filak eaf24d6 
 doc/Makefile.am           |  2 +-
Jakub Filak eaf24d6 
 src/plugins/Makefile.am   |  9 ++++++---
Jakub Filak eaf24d6 
 src/workflows/Makefile.am | 22 +++++++++++++++++-----
Jakub Filak eaf24d6 
 4 files changed, 28 insertions(+), 13 deletions(-)
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
diff --git a/configure.ac b/configure.ac
Jakub Filak eaf24d6 
index 179add8..cef8b64 100644
Jakub Filak eaf24d6 
--- a/configure.ac
Jakub Filak eaf24d6 
+++ b/configure.ac
Jakub Filak eaf24d6 
@@ -105,8 +105,8 @@ XMLRPC_CLIENT_LIBS=`xmlrpc-c-config client --libs 2> /dev/null`
Jakub Filak eaf24d6 
 AC_SUBST(XMLRPC_CLIENT_CFLAGS)
Jakub Filak eaf24d6 
 AC_SUBST(XMLRPC_CLIENT_LIBS)
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
-# enable bugzilla translations
Jakub Filak eaf24d6 
-for FILE in `grep "#.*ugzilla.*" po/POTFILES.in`
Jakub Filak eaf24d6 
+# enable bugzilla & deps translations
Jakub Filak eaf24d6 
+for FILE in `grep -e "#.*ugzilla.*" -e "#.*naconda.*" po/POTFILES.in`
Jakub Filak eaf24d6 
 do
Jakub Filak eaf24d6 
   sed -ie "s,$FILE,${FILE:1}," po/POTFILES.in
Jakub Filak eaf24d6 
   sed -ie "\,^${FILE:1}$,d" po/POTFILES.skip
Jakub Filak eaf24d6 
@@ -114,8 +114,8 @@ done
Jakub Filak eaf24d6 
 else
Jakub Filak eaf24d6 
 AM_CONDITIONAL(BUILD_BUGZILLA, false)
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
-# disablie bugzilla translations
Jakub Filak eaf24d6 
-for FILE in `grep "ugzilla" po/POTFILES.in`
Jakub Filak eaf24d6 
+# disablie bugzilla & deps translations
Jakub Filak eaf24d6 
+for FILE in `grep -e "ugzilla" -e "naconda" po/POTFILES.in`
Jakub Filak eaf24d6 
 do
Jakub Filak eaf24d6 
   if test "${FILE:0:1}" = "#"
Jakub Filak eaf24d6 
   then
Jakub Filak eaf24d6 
diff --git a/doc/Makefile.am b/doc/Makefile.am
Jakub Filak eaf24d6 
index fc5241d..b52a043 100644
Jakub Filak eaf24d6 
--- a/doc/Makefile.am
Jakub Filak eaf24d6 
+++ b/doc/Makefile.am
Jakub Filak eaf24d6 
@@ -12,6 +12,7 @@ MAN1_TXT += report-cli.txt
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 if BUILD_BUGZILLA
Jakub Filak eaf24d6 
 MAN1_TXT += reporter-bugzilla.txt
Jakub Filak eaf24d6 
+MAN1_TXT += report.txt
Jakub Filak eaf24d6 
 endif
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 MAN1_TXT += reporter-kerneloops.txt
Jakub Filak eaf24d6 
@@ -19,7 +20,6 @@ MAN1_TXT += reporter-mailx.txt
Jakub Filak eaf24d6 
 MAN1_TXT += reporter-print.txt
Jakub Filak eaf24d6 
 MAN1_TXT += reporter-rhtsupport.txt
Jakub Filak eaf24d6 
 MAN1_TXT += reporter-upload.txt
Jakub Filak eaf24d6 
-MAN1_TXT += report.txt
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 MAN5_TXT =
Jakub Filak eaf24d6 
 MAN5_TXT += report_event.conf.txt
Jakub Filak eaf24d6 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
Jakub Filak eaf24d6 
index 16ff97c..129b436 100644
Jakub Filak eaf24d6 
--- a/src/plugins/Makefile.am
Jakub Filak eaf24d6 
+++ b/src/plugins/Makefile.am
Jakub Filak eaf24d6 
@@ -2,7 +2,9 @@ pluginslibdir = $(PLUGINS_LIB_DIR)
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 reporters_bin =
Jakub Filak eaf24d6 
 if BUILD_BUGZILLA
Jakub Filak eaf24d6 
-reporters_bin += reporter-bugzilla
Jakub Filak eaf24d6 
+reporters_bin += \
Jakub Filak eaf24d6 
+    reporter-bugzilla \
Jakub Filak eaf24d6 
+    report
Jakub Filak eaf24d6 
 endif
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 if BUILD_UREPORT
Jakub Filak eaf24d6 
@@ -14,8 +16,7 @@ bin_PROGRAMS = $(reporters_bin) \
Jakub Filak eaf24d6 
     reporter-kerneloops \
Jakub Filak eaf24d6 
     reporter-upload \
Jakub Filak eaf24d6 
     reporter-mailx \
Jakub Filak eaf24d6 
-    reporter-print \
Jakub Filak eaf24d6 
-    report
Jakub Filak eaf24d6 
+    reporter-print
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 pluginsconfdir = $(PLUGINS_CONF_DIR)
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
@@ -218,6 +219,7 @@ reporter_print_CPPFLAGS = \
Jakub Filak eaf24d6 
 reporter_print_LDADD = \
Jakub Filak eaf24d6 
     ../lib/libreport.la
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
+if BUILD_BUGZILLA
Jakub Filak eaf24d6 
 report_SOURCES = \
Jakub Filak eaf24d6 
     report.c
Jakub Filak eaf24d6 
 report_CPPFLAGS = \
Jakub Filak eaf24d6 
@@ -235,6 +237,7 @@ report_CPPFLAGS = \
Jakub Filak eaf24d6 
     -D_GNU_SOURCE
Jakub Filak eaf24d6 
 report_LDADD = \
Jakub Filak eaf24d6 
     ../lib/libreport.la
Jakub Filak eaf24d6 
+endif
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 if BUILD_UREPORT
Jakub Filak eaf24d6 
 reporter_ureport_SOURCES = \
Jakub Filak eaf24d6 
diff --git a/src/workflows/Makefile.am b/src/workflows/Makefile.am
Jakub Filak eaf24d6 
index 17e3f1a..45ba7e0 100644
Jakub Filak eaf24d6 
--- a/src/workflows/Makefile.am
Jakub Filak eaf24d6 
+++ b/src/workflows/Makefile.am
Jakub Filak eaf24d6 
@@ -3,30 +3,42 @@ workflowsdir = $(WORKFLOWS_DIR)
Jakub Filak eaf24d6 
 dist_workflows_DATA = \
Jakub Filak eaf24d6 
     workflow_Fedora.xml \
Jakub Filak eaf24d6 
     workflow_Upload.xml \
Jakub Filak eaf24d6 
-    workflow_AnacondaFedora.xml \
Jakub Filak eaf24d6 
-    workflow_AnacondaUpload.xml \
Jakub Filak eaf24d6 
     workflow_RHELCCpp.xml \
Jakub Filak eaf24d6 
     workflow_RHELKerneloops.xml \
Jakub Filak eaf24d6 
     workflow_RHELPython.xml \
Jakub Filak eaf24d6 
     workflow_RHELvmcore.xml \
Jakub Filak eaf24d6 
     workflow_RHELxorg.xml
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
+if BUILD_BUGZILLA
Jakub Filak eaf24d6 
+dist_workflows_DATA += \
Jakub Filak eaf24d6 
+    workflow_AnacondaFedora.xml \
Jakub Filak eaf24d6 
+    workflow_AnacondaUpload.xml
Jakub Filak eaf24d6 
+endif
Jakub Filak eaf24d6 
+
Jakub Filak eaf24d6 
 workflowsconfdir = $(WORKFLOWS_CONF_DIR)
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 dist_workflowsconf_DATA =\
Jakub Filak eaf24d6 
     report_fedora.conf \
Jakub Filak eaf24d6 
-    anaconda_event.conf \
Jakub Filak eaf24d6 
     report_rhel.conf
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
+if BUILD_BUGZILLA
Jakub Filak eaf24d6 
+dist_workflowsconf_DATA += \
Jakub Filak eaf24d6 
+    anaconda_event.conf
Jakub Filak eaf24d6 
+endif
Jakub Filak eaf24d6 
+
Jakub Filak eaf24d6 
 @INTLTOOL_XML_RULE@
Jakub Filak eaf24d6
Jakub Filak eaf24d6 
 EXTRA_DIST = \
Jakub Filak eaf24d6 
     workflow_Fedora.xml.in \
Jakub Filak eaf24d6 
     workflow_Upload.xml.in \
Jakub Filak eaf24d6 
-    workflow_AnacondaFedora.xml.in \
Jakub Filak eaf24d6 
-    workflow_AnacondaUpload.xml.in \
Jakub Filak eaf24d6 
     workflow_RHELCCpp.xml.in \
Jakub Filak eaf24d6 
     workflow_RHELKerneloops.xml.in \
Jakub Filak eaf24d6 
     workflow_RHELPython.xml.in \
Jakub Filak eaf24d6 
     workflow_RHELvmcore.xml.in \
Jakub Filak eaf24d6 
     workflow_RHELxorg.xml.in
Jakub Filak eaf24d6 
+
Jakub Filak eaf24d6 
+if BUILD_BUGZILLA
Jakub Filak eaf24d6 
+EXTRA_DIST += \
Jakub Filak eaf24d6 
+    workflow_AnacondaFedora.xml.in \
Jakub Filak eaf24d6 
+    workflow_AnacondaUpload.xml.in
Jakub Filak eaf24d6 
+endif
Jakub Filak eaf24d6 
--
Jakub Filak eaf24d6 
1.8.1.4
Jakub Filak eaf24d6
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.