commit 913b07b5ca7f3f779ccadcb4fce8b09719f9dfda
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Feb 25 20:29:58 2011 +0200
Build httpmime module.
0001-Cleanup-pom.patch | 146 ++++++++++++++++++++++++++-----------------
httpcomponents-client.spec | 30 +++++----
2 files changed, 105 insertions(+), 71 deletions(-)
---
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index d4ba8e6..ac7b967 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,6 +1,84 @@
+--- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
++++ httpclient/pom.xml 2011-02-18 13:38:36.221371560 +0200
+@@ -38,7 +38,7 @@
+ HttpComponents Client (base module)
+ </description>
+ <
url>http://hc.apache.org/httpcomponents-client</url>
+- <packaging>jar</packaging>
++ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+@@ -71,12 +71,6 @@
+ <version>${easymock.version}</version>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.easymock</groupId>
+- <artifactId>easymockclassextension</artifactId>
+- <version>${easymock.version}</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <properties>
+@@ -122,25 +116,12 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <flushPolicy>threaded</flushPolicy>
+- <flushInterval>100</flushInterval>
+- <targetPercentage>50%</targetPercentage>
+- </configuration>
+- <executions>
+- <execution>
+- <id>site</id>
+- <phase>pre-site</phase>
+- <goals>
+- <goal>instrument</goal>
+- </goals>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
++ <plugin>
++ <groupId>org.apache.felix</groupId>
++ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
++ </plugin>
++ </plugins>
+ </build>
+
+ <reporting>
+@@ -165,14 +146,6 @@
+ </plugin>
+
+ <plugin>
+- <groupId>com.atlassian.maven.plugins</groupId>
+- <artifactId>maven-clover2-plugin</artifactId>
+- <configuration>
+- <jdk>1.5</jdk>
+- </configuration>
+- </plugin>
+-
+- <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
--- pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
-+++ pom.xml 2011-02-17 22:03:40.828341546 +0200
-@@ -88,21 +88,6 @@
++++ pom.xml 2011-02-25 20:17:20.519335750 +0200
+@@ -81,28 +81,11 @@
+ <modules>
+ <module>httpclient</module>
+ <module>httpmime</module>
+- <module>httpclient-cache</module>
+- <module>httpclient-osgi</module>
+ </modules>
+
<build>
<plugins>
<plugin>
@@ -22,7 +100,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
-@@ -189,49 +174,6 @@
+@@ -189,49 +172,6 @@
</configuration>
</plugin>
<plugin>
@@ -72,7 +150,7 @@
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
-@@ -252,14 +194,7 @@
+@@ -252,14 +192,7 @@
</execution>
</executions>
</plugin>
@@ -88,7 +166,7 @@
</build>
<reporting>
-@@ -280,15 +215,7 @@
+@@ -280,15 +213,7 @@
</reportSets>
</plugin>
@@ -105,10 +183,10 @@
</reporting>
</project>
---- httpclient/pom.xml.sav 2011-01-17 22:00:53.000000000 +0200
-+++ httpclient/pom.xml 2011-02-18 13:38:36.221371560 +0200
+--- httpmime/pom.xml.sav 2011-01-17 22:00:44.000000000 +0200
++++ httpmime/pom.xml 2011-02-25 20:19:09.191564653 +0200
@@ -38,7 +38,7 @@
- HttpComponents Client (base module)
+ HttpComponents HttpClient - MIME coded entities
</description>
<
url>http://hc.apache.org/httpcomponents-client</url>
- <packaging>jar</packaging>
@@ -116,63 +194,15 @@
<dependencies>
<dependency>
-@@ -71,12 +71,6 @@
- <version>${easymock.version}</version>
- <scope>test</scope>
- </dependency>
-- <dependency>
-- <groupId>org.easymock</groupId>
-- <artifactId>easymockclassextension</artifactId>
-- <version>${easymock.version}</version>
-- <scope>test</scope>
-- </dependency>
- </dependencies>
-
- <properties>
-@@ -122,25 +116,12 @@
+@@ -112,6 +112,11 @@
</execution>
</executions>
</plugin>
-- <plugin>
-- <groupId>com.atlassian.maven.plugins</groupId>
-- <artifactId>maven-clover2-plugin</artifactId>
-- <configuration>
-- <flushPolicy>threaded</flushPolicy>
-- <flushInterval>100</flushInterval>
-- <targetPercentage>50%</targetPercentage>
-- </configuration>
-- <executions>
-- <execution>
-- <id>site</id>
-- <phase>pre-site</phase>
-- <goals>
-- <goal>instrument</goal>
-- </goals>
-- </execution>
-- </executions>
-- </plugin>
-- </plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
-+ </plugins>
+ </plugins>
</build>
- <reporting>
-@@ -165,14 +146,6 @@
- </plugin>
-
- <plugin>
-- <groupId>com.atlassian.maven.plugins</groupId>
-- <artifactId>maven-clover2-plugin</artifactId>
-- <configuration>
-- <jdk>1.5</jdk>
-- </configuration>
-- </plugin>
--
-- <plugin>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index 7ab4896..b2bf294 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.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL:
http://hc.apache.org/
@@ -15,10 +15,12 @@ BuildArch: noarch
BuildRequires: httpcomponents-project
BuildRequires: httpcomponents-core
+BuildRequires: apache-mime4j
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: httpcomponents-core
+Requires: apache-mime4j
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -45,26 +47,25 @@ API docs for %{name}.
%patch0 -b .sav
%build
-# skip httpmime, httpclient only. For httpmime we need org.apache.james:apache-mime4j
-pushd httpclient
-
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc
-popd
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
-cd httpclient
# jars
-install -D -m 0644 target/httpclient-%{version}.jar
%{buildroot}%{_javadir}/%{base_name}/httpclient.jar
+install -D -m 0644 httpclient/target/httpclient-%{version}.jar
%{buildroot}%{_javadir}/%{base_name}/httpclient.jar
+install -D -m 0644 httpmime/target/httpmime-%{version}.jar
%{buildroot}%{_javadir}/%{base_name}/httpmime.jar
-# pom
+# main pom
install -D -m 0644 pom.xml \
+ %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom
+%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version}
JPP/%{base_name} httpcomponents-client
+# pom
+install -D -m 0644 httpclient/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpclient.pom
%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{base_name}
httpclient
+install -D -m 0644 httpmime/pom.xml \
+ %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpmime.pom
+%add_to_maven_depmap org.apache.httpcomponents httpmime %{version} JPP/%{base_name}
httpmime
-# main pom
-install -D -m 0644 ../pom.xml \
- %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom
-%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version}
JPP/%{base_name} httpcomponents-client
# javadocs
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -91,6 +92,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Fri Feb 25 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-4
+- Build httpmime module.
+
* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-3
- Don't use basename as an identifier.