Update to latest upstream bugfix
This commit is contained in:
Stanislav Ochotnicky
parent
9ac0744a98
commit
6341a299f4
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@
|
||||
httpcomponents-client-4.1-src.tar.gz
|
||||
/httpcomponents-client-4.1.1-src.tar.gz
|
||||
/httpcomponents-client-4.1.2-src.tar.gz
|
||||
/httpcomponents-client-4.1.3-src.tar.gz
|
||||
|
||||
@ -1,5 +1,16 @@
|
||||
--- pom.xml.sav 2011-03-14 16:54:35.000000000 -0400
|
||||
+++ pom.xml 2011-07-15 13:51:08.537725611 -0400
|
||||
From 69fb282ec131437de7a4f0f3a8a38c764ddd05af Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Thu, 1 Mar 2012 11:38:36 +0100
|
||||
Subject: [PATCH 1/3] Remove few modules and deps
|
||||
|
||||
---
|
||||
pom.xml | 92 +-------------------------------------------------------------
|
||||
1 files changed, 2 insertions(+), 90 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 25a70a2..39c4777 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -82,28 +82,11 @@
|
||||
<modules>
|
||||
<module>httpclient</module>
|
||||
@ -29,10 +40,11 @@
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<configuration>
|
||||
<archive>
|
||||
@@ -190,49 +173,6 @@
|
||||
@@ -200,62 +183,6 @@
|
||||
</tasks>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
- <plugin>
|
||||
- <groupId>com.agilejava.docbkx</groupId>
|
||||
- <artifactId>docbkx-maven-plugin</artifactId>
|
||||
- <dependencies>
|
||||
@ -43,6 +55,16 @@
|
||||
- <scope>runtime</scope>
|
||||
- </dependency>
|
||||
- </dependencies>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <id>tutorial-site</id>
|
||||
- <goals>
|
||||
- <goal>generate-html</goal>
|
||||
- <goal>generate-pdf</goal>
|
||||
- </goals>
|
||||
- <phase>pre-site</phase>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- <configuration>
|
||||
- <includes>index.xml</includes>
|
||||
- <chunkedOutput>true</chunkedOutput>
|
||||
@ -57,13 +79,14 @@
|
||||
- </entity>
|
||||
- </entities>
|
||||
- <postProcess>
|
||||
- <copy todir="target/site/tutorial">
|
||||
- <fileset dir="target/docbkx">
|
||||
- <copy todir="target/site/tutorial/html"
|
||||
- failonerror="false">
|
||||
- <fileset dir="target/docbkx/html/index">
|
||||
- <include name="**/*.html" />
|
||||
- <include name="**/*.pdf" />
|
||||
- </fileset>
|
||||
- </copy>
|
||||
- <copy todir="target/site/tutorial/html">
|
||||
- <copy todir="target/site/tutorial/html"
|
||||
- failonerror="false">
|
||||
- <fileset dir="src/docbkx/resources">
|
||||
- <include name="**/*.css" />
|
||||
- <include name="**/*.png" />
|
||||
@ -71,15 +94,16 @@
|
||||
- <include name="**/*.jpg" />
|
||||
- </fileset>
|
||||
- </copy>
|
||||
- <move file="target/site/tutorial/pdf/index.pdf" tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf" failonerror="false" />
|
||||
- <copy file="target/docbkx/pdf/index.pdf"
|
||||
- tofile="target/site/tutorial/pdf/httpclient-tutorial.pdf"
|
||||
- failonerror="false"/>
|
||||
- </postProcess>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
@@ -253,14 +193,7 @@
|
||||
@@ -277,14 +204,7 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
@ -95,7 +119,7 @@
|
||||
</build>
|
||||
|
||||
<reporting>
|
||||
@@ -281,15 +214,7 @@
|
||||
@@ -305,15 +225,7 @@
|
||||
</reportSets>
|
||||
</plugin>
|
||||
|
||||
@ -112,3 +136,6 @@
|
||||
</reporting>
|
||||
|
||||
</project>
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
@ -1,5 +1,16 @@
|
||||
--- httpmime/pom.xml.sav 2011-03-14 16:54:32.000000000 -0400
|
||||
+++ httpmime/pom.xml 2011-07-15 13:51:08.530725700 -0400
|
||||
From 9e38a0ea7c90f6ae416c790c3a03addef3ff66d2 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Thu, 1 Mar 2012 11:39:17 +0100
|
||||
Subject: [PATCH 2/3] Make httpmime into bundle
|
||||
|
||||
---
|
||||
httpmime/pom.xml | 7 ++++++-
|
||||
1 files changed, 6 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/httpmime/pom.xml b/httpmime/pom.xml
|
||||
index a5e0179..43b5275 100644
|
||||
--- a/httpmime/pom.xml
|
||||
+++ b/httpmime/pom.xml
|
||||
@@ -38,7 +38,7 @@
|
||||
HttpComponents HttpClient - MIME coded entities
|
||||
</description>
|
||||
@ -21,3 +32,6 @@
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
@ -1,5 +1,17 @@
|
||||
--- httpclient/pom.xml.sav 2011-03-14 16:54:35.000000000 -0400
|
||||
+++ httpclient/pom.xml 2011-07-15 16:41:41.568795119 -0400
|
||||
From ff696dac1e539854085b48c51d9d315ab94e469c Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Thu, 1 Mar 2012 11:39:52 +0100
|
||||
Subject: [PATCH 3/3] Make httpclient into bundle
|
||||
|
||||
Also remove few build deps we don't have
|
||||
---
|
||||
httpclient/pom.xml | 47 +++++++++++++++++++----------------------------
|
||||
1 files changed, 19 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/httpclient/pom.xml b/httpclient/pom.xml
|
||||
index 0e391f6..f0c6632 100644
|
||||
--- a/httpclient/pom.xml
|
||||
+++ b/httpclient/pom.xml
|
||||
@@ -38,7 +38,7 @@
|
||||
HttpComponents Client (base module)
|
||||
</description>
|
||||
@ -78,3 +90,6 @@
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
|
||||
Name: httpcomponents-client
|
||||
Summary: HTTP agent implementation based on httpcomponents HttpCore
|
||||
Version: 4.1.2
|
||||
Release: 2%{?dist}
|
||||
Version: 4.1.3
|
||||
Release: 1%{?dist}
|
||||
Group: Development/Libraries
|
||||
License: ASL 2.0
|
||||
URL: http://hc.apache.org/
|
||||
@ -11,9 +11,11 @@ Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/h
|
||||
# Remove optional build deps not available in Fedora
|
||||
# and add proper Apache felix bundle plugin instructions
|
||||
# so that we get a reasonable OSGi manifest.
|
||||
Patch0: main-pom-fix.patch
|
||||
Patch1: httpclient-pom-fix.patch
|
||||
Patch2: httpmime-pom-fix.patch
|
||||
Patch0: 0001-Remove-few-modules-and-deps.patch
|
||||
Patch1: 0002-Make-httpmime-into-bundle.patch
|
||||
Patch2: 0003-Make-httpclient-into-bundle.patch
|
||||
|
||||
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
@ -47,9 +49,9 @@ API docs for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -b .sav
|
||||
%patch1 -b .sav
|
||||
%patch2 -b .sav
|
||||
%patch0 -p1 -b .sav
|
||||
%patch1 -p1 -b .sav
|
||||
%patch2 -p1 -b .sav
|
||||
|
||||
%build
|
||||
mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
|
||||
@ -90,6 +92,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 1 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> 4.1.3-1
|
||||
- Update to latest upstream bugfix
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user