[maven-doxia] Conditionally disable itext module

Mikolaj Izdebski mizdebsk at fedoraproject.org
Mon Apr 8 09:12:11 UTC 2013


commit b9a2c01c560ec044958bb1df15a044471b8c6af9
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Apr 8 11:00:56 2013 +0200

    Conditionally disable itext module

 maven-doxia.spec |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/maven-doxia.spec b/maven-doxia.spec
index 6396f42..ccd7a75 100644
--- a/maven-doxia.spec
+++ b/maven-doxia.spec
@@ -28,9 +28,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%if 0%{?fedora}
+%bcond_without itext
+%endif
+
 Name:           maven-doxia
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Content generation framework
 License:        ASL 2.0
@@ -51,14 +55,12 @@ Patch1:         0002-doxia-core-remove-plexus-component-annotation.patch
 # http://jira.codehaus.org/browse/DOXIA-53
 Patch3:         0004-Fix-itext-dependency.patch
 
-
 BuildArch:      noarch
 
 BuildRequires:  java >= 1:1.6.0
 BuildRequires:  jpackage-utils
 BuildRequires:  ant
 BuildRequires:  ant-nodeps
-BuildRequires:  itext
 BuildRequires:  plexus-cli
 BuildRequires:  maven-local
 BuildRequires:  maven-assembly-plugin
@@ -99,6 +101,9 @@ BuildRequires:  avalon-framework
 BuildRequires:  geronimo-parent-poms
 BuildRequires:  geronimo-jms
 BuildRequires:  javamail
+%if %{with itext}
+BuildRequires:  itext
+%endif
 
 Obsoletes:      maven-doxia-book < %{epoch}:%{version}-%{release}
 Obsoletes:      maven-doxia-maven-plugin < %{epoch}:%{version}-%{release}
@@ -154,11 +159,13 @@ Summary: FO module for %{name}
 %description module-fo
 This package provides %{summary}.
 
+%if %{with itext}
 %package module-itext
 Summary: iText module for %{name}
 
 %description module-itext
 This package provides %{summary}.
+%endif
 
 %package module-latex
 Summary: Latex module for %{name}
@@ -231,7 +238,10 @@ API documentation for %{name}.
 "<useJava5>true</useJava5>" doxia-modules/doxia-module-fml/pom.xml
 
 # markdown module requires older version (1.0.2) of the pegdown library
-%pom_disable_module doxia-module-markdown doxia-modules/pom.xml
+%pom_disable_module doxia-module-markdown doxia-modules
+%if %{without itext}
+%pom_disable_module doxia-module-itext doxia-modules
+%endif
 
 %build
 # tests disabled because some use old plexus-container and don't work
@@ -252,7 +262,9 @@ API documentation for %{name}.
 %files module-docbook-simple -f .mfiles-doxia-module-docbook-simple
 %files module-fml -f .mfiles-doxia-module-fml
 %files module-fo -f .mfiles-doxia-module-fo
+%if %{with itext}
 %files module-itext -f .mfiles-doxia-module-itext
+%endif
 %files module-latex -f .mfiles-doxia-module-latex
 %files module-rtf -f .mfiles-doxia-module-rtf
 %files modules -f .mfiles-doxia-modules
@@ -267,6 +279,9 @@ API documentation for %{name}.
 
 
 %changelog
+* Mon Apr  8 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.3-2
+- Conditionally disable itext module
+
 * Tue Mar 19 2013 Michal Srb <msrb at redhat.com> - 0:1.3-1
 - Update to upstream version 1.3
 - Remove temporary dependencies on subpackages


More information about the scm-commits mailing list