From cacf844acca751dbe4d647561f4405f889ff9fa0 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 16 Aug 2011 14:44:44 +0200 Subject: [PATCH] Update to latest upstream (4.1.2) - Minor tweaks according to guidelines --- .gitignore | 1 + httpcomponents-client.spec | 28 +++++++++++----------------- sources | 2 +- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 8f49a16..6ffa31c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /httpcomponents-client-4.0.3-src.tar.gz httpcomponents-client-4.1-src.tar.gz /httpcomponents-client-4.1.1-src.tar.gz +/httpcomponents-client-4.1.2-src.tar.gz diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec index 73170e9..4237f6e 100644 --- a/httpcomponents-client.spec +++ b/httpcomponents-client.spec @@ -2,8 +2,8 @@ Name: httpcomponents-client Summary: HTTP agent implementation based on httpcomponents HttpCore -Version: 4.1.1 -Release: 3%{?dist} +Version: 4.1.2 +Release: 1%{?dist} Group: Development/Libraries License: ASL 2.0 URL: http://hc.apache.org/ @@ -28,9 +28,6 @@ Requires: httpcomponents-core Requires: apache-mime4j Requires: apache-commons-codec -Requires(post): jpackage-utils -Requires(postun): jpackage-utils - %description HttpClient is a HTTP/1.1 compliant HTTP agent implementation based on httpcomponents HttpCore. It also provides reusable components for @@ -69,10 +66,11 @@ install -D -m 0644 pom.xml \ # 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 +%add_maven_depmap JPP.%{base_name}-httpclient.pom %{base_name}/httpclient.jar + 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 +%add_maven_depmap JPP.%{base_name}-httpmime.pom %{base_name}/httpmime.jar # javadocs @@ -80,26 +78,22 @@ install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files -%defattr(-,root,root,-) %doc README.txt LICENSE.txt RELEASE_NOTES.txt %{_mavendepmapfragdir}/%{name} %{_mavenpomdir}/JPP.%{base_name}*.pom %{_javadir}/%{basename} %files javadoc -%defattr(-,root,root,-) %doc LICENSE.txt -%doc %{_javadocdir}/* +%doc %{_javadocdir}/%{name} %changelog +* Tue Aug 16 2011 Stanislav Ochotnicky - 4.1.2-1 +- Update to latest upstream (4.1.2) +- Minor tweaks according to guidelines + * Fri Jul 15 2011 Severin Gehwolf 4.1.1-3 - Fix for RH Bz#718830. Add instructions so as to not Import-Package optional dependencies. @@ -107,7 +101,7 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} * Thu Apr 7 2011 Severin Gehwolf 4.1.1-2 - Add BR/R apache-commons-codec, since httpcomponents-client's MANIFEST.MF has an Import-Package: org.apache.commons.codec - header. + header. * Tue Mar 29 2011 Stanislav Ochotnicky - 4.1.1-1 - New upstream bugfix version (4.1.1) diff --git a/sources b/sources index 038cbec..6e3bca2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12be9646128db4a4383e47341cbeb7fd httpcomponents-client-4.1.1-src.tar.gz +3ac8388815163beb7c3a30cad261212e httpcomponents-client-4.1.2-src.tar.gz