Remove mockito from Requires (not needed really)
- BR on mockito is now conditional on Fedora
This commit is contained in:
parent
3f7f383035
commit
45f7e93922
@ -3,7 +3,7 @@
|
|||||||
Name: httpcomponents-core
|
Name: httpcomponents-core
|
||||||
Summary: Set of low level Java HTTP transport components for HTTP services
|
Summary: Set of low level Java HTTP transport components for HTTP services
|
||||||
Version: 4.2.1
|
Version: 4.2.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://hc.apache.org/
|
URL: http://hc.apache.org/
|
||||||
@ -16,13 +16,14 @@ BuildRequires: jpackage-utils
|
|||||||
BuildRequires: maven-surefire-provider-junit4
|
BuildRequires: maven-surefire-provider-junit4
|
||||||
BuildRequires: apache-commons-logging
|
BuildRequires: apache-commons-logging
|
||||||
BuildRequires: junit
|
BuildRequires: junit
|
||||||
|
%if 0%{?rhel} <= 0
|
||||||
BuildRequires: mockito
|
BuildRequires: mockito
|
||||||
|
%endif
|
||||||
|
|
||||||
Requires: java >= 1:1.6.0
|
Requires: java >= 1:1.6.0
|
||||||
Requires: jpackage-utils
|
Requires: jpackage-utils
|
||||||
Requires: apache-commons-logging
|
Requires: apache-commons-logging
|
||||||
Requires: junit
|
Requires: junit
|
||||||
Requires: mockito
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
HttpCore is a set of low level HTTP transport components that can be
|
HttpCore is a set of low level HTTP transport components that can be
|
||||||
@ -72,7 +73,11 @@ for module in httpcore httpcore-nio; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mvn-rpmbuild install javadoc:aggregate
|
mvn-rpmbuild \
|
||||||
|
%if 0%{?rhel}
|
||||||
|
-Dmaven.test.skip=true \
|
||||||
|
%endif
|
||||||
|
install javadoc:aggregate
|
||||||
|
|
||||||
%install
|
%install
|
||||||
install -dm 755 %{buildroot}/%{_mavenpomdir}
|
install -dm 755 %{buildroot}/%{_mavenpomdir}
|
||||||
@ -110,6 +115,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
|
|||||||
%doc %{_javadocdir}/%{name}
|
%doc %{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 27 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 4.2.1-3
|
||||||
|
- Remove mockito from Requires (not needed really)
|
||||||
|
- BR on mockito is now conditional on Fedora
|
||||||
|
|
||||||
* Fri Jul 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.1-2
|
* Fri Jul 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.1-2
|
||||||
- Install NOTICE.txt file
|
- Install NOTICE.txt file
|
||||||
- Fix javadir directory ownership
|
- Fix javadir directory ownership
|
||||||
|
Loading…
Reference in New Issue
Block a user