Make client cache jar into a OSGi bundle

httpcomponents-client.spec

@@ -7,7 +7,7 @@
 Name:              httpcomponents-client
 Summary:           HTTP agent implementation based on httpcomponents HttpCore
 Version:           4.5.1
-Release:           1%{?dist}
+Release:           2%{?dist}
 License:           ASL 2.0
 URL:               http://hc.apache.org/
 Source0:           http://www.apache.org/dist/httpcomponents/httpclient/source/%{name}-%{version}-src.tar.gz
@@ -81,7 +81,7 @@ 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
+for module in httpclient httpmime httpclient-cache; do
     %pom_xpath_remove "pom:project/pom:packaging" $module
     %pom_xpath_inject "pom:project" "<packaging>bundle</packaging>" $module
 done
@@ -123,6 +123,23 @@ done
       </configuration>
     </plugin>" httpclient
 
+# Make httpclient-cache into bundle
+%pom_xpath_inject pom:build/pom:plugins "
+    <plugin>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>maven-bundle-plugin</artifactId>
+      <extensions>true</extensions>
+      <configuration>
+        <instructions>
+          <Export-Package>*</Export-Package>
+          <Import-Package>net.sf.ehcache;resolution:=optional,net.spy.memcached;resolution:=optional,*</Import-Package>
+          <Private-Package></Private-Package>
+          <_nouses>true</_nouses>
+        </instructions>
+        <excludeDependencies>true</excludeDependencies>
+      </configuration>
+    </plugin>" httpclient-cache
+
 # requires network
 rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
 
@@ -144,6 +161,9 @@ rm httpclient/src/test/java/org/apache/http/client/config/TestRequestConfig.java
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Jan 25 2016 Mat Booth <mat.booth@redhat.com> - 4.5.1-2
+- Make client cache jar into a OSGi bundle
+
 * Wed Sep 16 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.5.1-1
 - Update to upstream version 4.5.1