[httpcomponents-core] Remove mockito from Requires (not needed really)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Mon Aug 27 15:10:01 UTC 2012
commit 45f7e93922bae25acaad66b69e26a74224283332
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Mon Aug 27 17:09:25 2012 +0200
Remove mockito from Requires (not needed really)
- BR on mockito is now conditional on Fedora
httpcomponents-core.spec | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 548e836..50652fc 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -3,7 +3,7 @@
Name: httpcomponents-core
Summary: Set of low level Java HTTP transport components for HTTP services
Version: 4.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@@ -16,13 +16,14 @@ BuildRequires: jpackage-utils
BuildRequires: maven-surefire-provider-junit4
BuildRequires: apache-commons-logging
BuildRequires: junit
+%if 0%{?rhel} <= 0
BuildRequires: mockito
+%endif
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: apache-commons-logging
Requires: junit
-Requires: mockito
%description
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
%build
-mvn-rpmbuild install javadoc:aggregate
+mvn-rpmbuild \
+%if 0%{?rhel}
+ -Dmaven.test.skip=true \
+%endif
+ install javadoc:aggregate
%install
install -dm 755 %{buildroot}/%{_mavenpomdir}
@@ -110,6 +115,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}
%changelog
+* Mon Aug 27 2012 Stanislav Ochotnicky <sochotnicky at 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 at redhat.com> - 4.2.1-2
- Install NOTICE.txt file
- Fix javadir directory ownership
More information about the scm-commits
mailing list