Also build HttpClient Cache (bug #1180696)

This commit is contained in:
Mikolaj Izdebski 2015-01-19 07:42:52 +01:00
parent 52b116fbb8
commit 2ffcbfea03

View File

@ -3,7 +3,7 @@
Name: httpcomponents-client Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.3.5 Version: 4.3.5
Release: 2%{?dist} Release: 3%{?dist}
License: ASL 2.0 License: ASL 2.0
URL: http://hc.apache.org/ URL: http://hc.apache.org/
Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz 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.apache.httpcomponents:project:pom:)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.mockito:mockito-core)
BuildRequires: mvn(net.sf.ehcache:ehcache-core)
BuildRequires: mvn(spy:spymemcached)
%description %description
HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on 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 %mvn_package ":{*}::tests:" tests
# Remove optional build deps not available in Fedora # Remove optional build deps not available in Fedora
%pom_disable_module httpclient-cache
%pom_disable_module httpclient-osgi %pom_disable_module httpclient-osgi
%pom_disable_module fluent-hc %pom_disable_module fluent-hc
%pom_remove_plugin :docbkx-maven-plugin %pom_remove_plugin :docbkx-maven-plugin
%pom_remove_plugin :clirr-maven-plugin %pom_remove_plugin :clirr-maven-plugin
%pom_remove_plugin :maven-checkstyle-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 # Add proper Apache felix bundle plugin instructions
# so that we get a reasonable OSGi manifest. # so that we get a reasonable OSGi manifest.
for module in httpclient httpmime; do 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 %doc LICENSE.txt NOTICE.txt
%changelog %changelog
* Fri Jan 9 2015 Richard Fearn <richardfearn@gmail.com> - 4.3.5-3
- Also build HttpClient Cache (bug #1180696)
* Tue Dec 02 2014 Michael Simacek <msimacek@redhat.com> - 4.3.5-2 * Tue Dec 02 2014 Michael Simacek <msimacek@redhat.com> - 4.3.5-2
- Build and install tests artifact (needed by copr-java) - Build and install tests artifact (needed by copr-java)