Make easymock3 dependency conditional for Fedora
This commit is contained in:
parent
a00cbbc9a2
commit
7c89621c6e
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 3.1
|
Version: 3.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Provides a host of helper utilities for the java.lang API
|
Summary: Provides a host of helper utilities for the java.lang API
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -19,7 +19,10 @@ BuildRequires: maven
|
|||||||
BuildRequires: apache-commons-parent
|
BuildRequires: apache-commons-parent
|
||||||
BuildRequires: apache-commons-io
|
BuildRequires: apache-commons-io
|
||||||
BuildRequires: junit4
|
BuildRequires: junit4
|
||||||
|
%if 0%{?rhel} <= 0
|
||||||
BuildRequires: easymock3
|
BuildRequires: easymock3
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildRequires: maven-antrun-plugin
|
BuildRequires: maven-antrun-plugin
|
||||||
BuildRequires: maven-plugin-bundle
|
BuildRequires: maven-plugin-bundle
|
||||||
BuildRequires: maven-resources-plugin
|
BuildRequires: maven-resources-plugin
|
||||||
@ -58,7 +61,11 @@ Requires: jpackage-utils
|
|||||||
%setup -q -n %{short_name}-%{version}-src
|
%setup -q -n %{short_name}-%{version}-src
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mvn-rpmbuild install javadoc:javadoc
|
mvn-rpmbuild \
|
||||||
|
%if 0%{?rhel}
|
||||||
|
-Dmaven.test.skip=true \
|
||||||
|
%endif
|
||||||
|
install javadoc:aggregate
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
@ -88,6 +95,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
|||||||
%doc %{_javadocdir}/%{name}
|
%doc %{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 27 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.1-3
|
||||||
|
- Make easymock3 dependency conditional for Fedora
|
||||||
|
|
||||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-2
|
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user