[jboss-marshalling/f18: 2/2] Conditionally remove dependency on apiviz
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Oct 15 10:27:20 UTC 2012
commit 5e2627af3455fdd2a84310a8be2c64a7e24bb9c1
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Oct 15 11:32:35 2012 +0200
Conditionally remove dependency on apiviz
jboss-marshalling.spec | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/jboss-marshalling.spec b/jboss-marshalling.spec
index c4646f1..a856cbc 100644
--- a/jboss-marshalling.spec
+++ b/jboss-marshalling.spec
@@ -3,7 +3,7 @@
Name: jboss-marshalling
Version: 1.3.13
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: JBoss Marshalling
Group: Development/Libraries
License: LGPLv2+
@@ -31,9 +31,11 @@ BuildRequires: maven-injection-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: jboss-modules
BuildRequires: qdox
-BuildRequires: apiviz
BuildRequires: jdepend
BuildRequires: graphviz
+%if 0%{?fedora}
+BuildRequires: apiviz
+%endif
Requires: jboss-modules
Requires: jpackage-utils
@@ -54,6 +56,11 @@ This package contains the API documentation for %{name}.
%setup -q -n %{name}-%{namedversion}
%patch0 -p1
+# Conditionally remove dependency on apiviz
+if [ %{?rhel} ]; then
+ %pom_remove_plugin :maven-javadoc-plugin
+fi
+
%build
# Caused by: java.lang.ClassNotFoundException: com.thoughtworks.qdox.model.AbstractInheritableJavaEntity
# But the clss exists in qdox WTF?
@@ -95,6 +102,9 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%doc COPYING.txt
%changelog
+* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.3.13-5
+- Conditionally remove dependency on apiviz
+
* Mon Oct 15 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.3.13-4
- Remove unneeded BR: gdata-java, maven-surefire-provider-testng, testng
More information about the scm-commits
mailing list