From 2ffcbfea032c0a8e4a61fc9956ac1910051cc7a7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Jan 2015 07:42:52 +0100 Subject: [PATCH] Also build HttpClient Cache (bug #1180696) --- httpcomponents-client.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index c1d258c..a5d43c5 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -3,7 +3,7 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore Version: 4.3.5 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: http://hc.apache.org/ Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz @@ -17,6 +17,8 @@ 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) +BuildRequires: mvn(net.sf.ehcache:ehcache-core) +BuildRequires: mvn(spy:spymemcached) %description HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on @@ -48,13 +50,20 @@ Classes for testing client applications. %mvn_package ":{*}::tests:" tests # Remove optional build deps not available in Fedora -%pom_disable_module httpclient-cache %pom_disable_module httpclient-osgi %pom_disable_module fluent-hc %pom_remove_plugin :docbkx-maven-plugin %pom_remove_plugin :clirr-maven-plugin %pom_remove_plugin :maven-checkstyle-plugin +# Don't compile/run httpclient-cache tests - they are incompatible with EasyMock 3.3 +%pom_remove_plugin org.apache.maven.plugins:maven-jar-plugin httpclient-cache +%pom_remove_dep org.easymock:easymockclassextension +for dep in org.easymock:easymockclassextension org.slf4j:slf4j-jcl; do + %pom_remove_dep $dep httpclient-cache +done +rm -rf httpclient-cache/src/test + # Add proper Apache felix bundle plugin instructions # so that we get a reasonable OSGi manifest. for module in httpclient httpmime; do @@ -121,6 +130,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java %doc LICENSE.txt NOTICE.txt %changelog +* Fri Jan 9 2015 Richard Fearn - 4.3.5-3 +- Also build HttpClient Cache (bug #1180696) + * Tue Dec 02 2014 Michael Simacek - 4.3.5-2 - Build and install tests artifact (needed by copr-java)