diff --git a/.gitignore b/.gitignore index 610c841..724c402 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /httpcomponents-client-4.0.3-src.tar.gz +httpcomponents-client-4.1-src.tar.gz diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch index 78c59dc..1a7621f 100644 --- a/0001-Cleanup-pom.patch +++ b/0001-Cleanup-pom.patch @@ -1,19 +1,8 @@ -From 00e8bdbfe680691c28ab6da5a40ca4ff020d5837 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -Date: Mon, 20 Dec 2010 15:56:06 +0100 -Subject: [PATCH] Cleanup pom - ---- - pom.xml | 72 --------------------------------------------------------------- - 1 files changed, 0 insertions(+), 72 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 3d0d20a..fce1fdd 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -144,78 +144,6 @@ - - +--- httpclient/pom.xml.sav 2011-02-17 21:47:11.997569572 +0200 ++++ httpclient/pom.xml 2011-02-17 21:48:40.911717624 +0200 +@@ -122,25 +122,7 @@ + + - - com.atlassian.maven.plugins @@ -29,24 +18,60 @@ index 3d0d20a..fce1fdd 100644 - pre-site - - instrument -- aggregate -- save-history - - - - +- ++ + + + +@@ -165,14 +147,6 @@ + + + +- com.atlassian.maven.plugins +- maven-clover2-plugin +- +- 1.5 +- +- +- - -- com.agilejava.docbkx -- docbkx-maven-plugin + maven-jxr-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 @@ + + + +- maven-notice-plugin +- org.apache.httpcomponents - - +- attach-notice-license - -- generate-html -- generate-pdf +- generate - -- pre-site - - +- +- Apache HttpComponents +- +- +- + maven-jar-plugin + + +@@ -189,49 +174,6 @@ + + + +- com.agilejava.docbkx +- docbkx-maven-plugin - - - org.docbook @@ -65,7 +90,7 @@ index 3d0d20a..fce1fdd 100644 - - - version -- ${pom.version} +- ${project.version} - - - @@ -87,9 +112,40 @@ index 3d0d20a..fce1fdd 100644 - - - - - +- + maven-resources-plugin + + +@@ -252,14 +194,7 @@ + + + +- +- org.codehaus.mojo +- clirr-maven-plugin +- +- ${comparisonVersion} +- +- +- ++ --- -1.7.3.3 - + + +@@ -280,15 +215,7 @@ + + + +- +- org.codehaus.mojo +- clirr-maven-plugin +- +- ${comparisonVersion} +- +- +- +- ++ + + + diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index b17793b..af77b86 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -1,7 +1,7 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore -Version: 4.0.3 -Release: 3%{?dist} +Version: 4.1 +Release: 1%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@ -42,16 +42,13 @@ Requires: jpackage-utils %prep %setup -q -%patch0 -p1 +%patch0 -b .sav %build # skip httpmime, httpclient only. For httpmime we need org.apache.james:apache-mime4j cd httpclient -export maven_repo_local=$(pwd)/.m2/repository -install -d $maven_repo_local -mvn-jpp -Dmaven.repo.local=$maven_repo_local \ - install javadoc:javadoc +mvn-rpmbuild -Dmaven.test.skip=true install javadoc:javadoc %install @@ -94,6 +91,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Thu Feb 17 2011 Alexander Kurtakov 4.1-1 +- Update to latest upstream version. + * Wed Feb 09 2011 Fedora Release Engineering - 4.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 02bacbd..f275dc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -003b803d1aa9c873c6d22e7471856254 httpcomponents-client-4.0.3-src.tar.gz +1a50cf1c2eeac0ff29a3cd095ed19954 httpcomponents-client-4.1-src.tar.gz