[apache-commons-lang3] Make easymock3 dependency conditional for Fedora

Stanislav Ochotnicky sochotni at fedoraproject.org
Mon Aug 27 16:04:36 UTC 2012


commit 7c89621c6e2773d5f5487c0755dc6bca50ff987e
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Aug 27 18:04:08 2012 +0200

    Make easymock3 dependency conditional for Fedora

 apache-commons-lang3.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec
index 706b863..11da638 100644
--- a/apache-commons-lang3.spec
+++ b/apache-commons-lang3.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Provides a host of helper utilities for the java.lang API
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -19,7 +19,10 @@ BuildRequires:  maven
 BuildRequires:  apache-commons-parent
 BuildRequires:  apache-commons-io
 BuildRequires:  junit4
+%if 0%{?rhel} <= 0
 BuildRequires:  easymock3
+%endif
+
 BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-plugin-bundle
 BuildRequires:  maven-resources-plugin
@@ -58,7 +61,11 @@ Requires:       jpackage-utils
 %setup -q -n %{short_name}-%{version}-src
 
 %build
-mvn-rpmbuild install javadoc:javadoc
+mvn-rpmbuild \
+%if 0%{?rhel}
+    -Dmaven.test.skip=true \
+%endif
+    install javadoc:aggregate
 
 %install
 
@@ -88,6 +95,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Aug 27 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 3.1-3
+- Make easymock3 dependency conditional for Fedora
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list