commit 26f99a1a13f43110b239cebdb76f58752323be31
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri Nov 28 15:25:38 2014 +0100
Build and install tests artifact (needed by copr-java)
httpcomponents-client.spec | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 020229e..b3aaa2c 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -16,6 +16,7 @@ BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(org.apache.httpcomponents:httpcore)
BuildRequires: mvn(org.apache.httpcomponents:project:pom:)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires: mvn(org.mockito:mockito-core)
%description
HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on
@@ -31,12 +32,20 @@ Summary: API documentation for %{name}
%description javadoc
%{summary}.
+%package tests
+Summary: Classes for testing client applications
+
+%description tests
+Classes for testing client applications.
+
%prep
%setup -q
-# Don't install javadoc, sources and tests jars
-%mvn_package ":{*}::{tests,sources,javadoc}:" __noinstall
+# Don't install javadoc and sources jars
+%mvn_package ":{*}::{sources,javadoc}:" __noinstall
+
+%mvn_package ":{*}::tests:" tests
# Remove optional build deps not available in Fedora
%pom_disable_module httpclient-cache
@@ -45,7 +54,6 @@ Summary: API documentation for %{name}
%pom_remove_plugin :docbkx-maven-plugin
%pom_remove_plugin :clirr-maven-plugin
%pom_remove_plugin :maven-checkstyle-plugin
-%pom_remove_dep :mockito-core httpclient
# Add proper Apache felix bundle plugin instructions
# so that we get a reasonable OSGi manifest.
@@ -91,13 +99,13 @@ done
</configuration>
</plugin>" httpclient
-
+# requires network
+rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
%build
%mvn_file ":{*}" httpcomponents/@1
-# tests are disabled due to bug in mockito (rhbz#1040350)
-%mvn_build -f
+%mvn_build
%install
%mvn_install
@@ -106,6 +114,9 @@ done
%files -f .mfiles
%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
+%files tests -f .mfiles-tests
+%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
+
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
Show replies by date