[jboss-modules/f18] Conditionally remove dependency on apiviz
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Oct 15 08:39:08 UTC 2012
commit ab12acf3fafceb741a0f0a16131131a89c0f9b3a
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Sep 3 19:11:35 2012 +0200
Conditionally remove dependency on apiviz
jboss-modules.spec | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/jboss-modules.spec b/jboss-modules.spec
index 610f697..6e88da9 100644
--- a/jboss-modules.spec
+++ b/jboss-modules.spec
@@ -3,7 +3,7 @@
Name: jboss-modules
Version: 1.1.1
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A Modular Classloading System
Group: Development/Libraries
License: LGPLv2+
@@ -31,8 +31,10 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-surefire-provider-junit4
-BuildRequires: apiviz
BuildRequires: junit4
+%if 0%{?fedora}
+BuildRequires: apiviz
+%endif
Requires: jpackage-utils
Requires: java
@@ -53,6 +55,11 @@ This package contains the API documentation for %{name}.
%patch0 -p1
+# Conditionally remove dependency on apiviz
+if [ %{?rhel} ]; then
+ %pom_remove_plugin :maven-javadoc-plugin
+fi
+
%build
mvn-rpmbuild install javadoc:aggregate
@@ -82,6 +89,9 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Mon Sep 3 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1.1-7
+- Conditionally remove dependency on apiviz
+
* Mon Sep 3 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1.1-6
- Remove unneeded BR: maven-injection-plugin
More information about the scm-commits
mailing list