Update to latest upstream version.
This commit is contained in:
Alexander Kurtakov
parent
00b485775e
commit
44f50c78c4
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/httpcomponents-client-4.0.3-src.tar.gz
|
||||
httpcomponents-client-4.1-src.tar.gz
|
||||
|
||||
@ -1,19 +1,8 @@
|
||||
From 00e8bdbfe680691c28ab6da5a40ca4ff020d5837 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
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 @@
|
||||
</tasks>
|
||||
</configuration>
|
||||
--- 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 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
- <plugin>
|
||||
- <groupId>com.atlassian.maven.plugins</groupId>
|
||||
@ -29,24 +18,60 @@ index 3d0d20a..fce1fdd 100644
|
||||
- <phase>pre-site</phase>
|
||||
- <goals>
|
||||
- <goal>instrument</goal>
|
||||
- <goal>aggregate</goal>
|
||||
- <goal>save-history</goal>
|
||||
- </goals>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
+ </plugins>
|
||||
</build>
|
||||
|
||||
<reporting>
|
||||
@@ -165,14 +147,6 @@
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
- <groupId>com.atlassian.maven.plugins</groupId>
|
||||
- <artifactId>maven-clover2-plugin</artifactId>
|
||||
- <configuration>
|
||||
- <jdk>1.5</jdk>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
-
|
||||
- <plugin>
|
||||
- <groupId>com.agilejava.docbkx</groupId>
|
||||
- <artifactId>docbkx-maven-plugin</artifactId>
|
||||
<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 @@
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
- <artifactId>maven-notice-plugin</artifactId>
|
||||
- <groupId>org.apache.httpcomponents</groupId>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <id>attach-notice-license</id>
|
||||
- <goals>
|
||||
- <goal>generate-html</goal>
|
||||
- <goal>generate-pdf</goal>
|
||||
- <goal>generate</goal>
|
||||
- </goals>
|
||||
- <phase>pre-site</phase>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- <configuration>
|
||||
- <projectTitle>Apache HttpComponents</projectTitle>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<configuration>
|
||||
<archive>
|
||||
@@ -189,49 +174,6 @@
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
- <groupId>com.agilejava.docbkx</groupId>
|
||||
- <artifactId>docbkx-maven-plugin</artifactId>
|
||||
- <dependencies>
|
||||
- <dependency>
|
||||
- <groupId>org.docbook</groupId>
|
||||
@ -65,7 +90,7 @@ index 3d0d20a..fce1fdd 100644
|
||||
- <entities>
|
||||
- <entity>
|
||||
- <name>version</name>
|
||||
- <value>${pom.version}</value>
|
||||
- <value>${project.version}</value>
|
||||
- </entity>
|
||||
- </entities>
|
||||
- <postProcess>
|
||||
@ -87,9 +112,40 @@ index 3d0d20a..fce1fdd 100644
|
||||
- </postProcess>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
|
||||
</plugins>
|
||||
- <plugin>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
@@ -252,14 +194,7 @@
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.codehaus.mojo</groupId>
|
||||
- <artifactId>clirr-maven-plugin</artifactId>
|
||||
- <configuration>
|
||||
- <comparisonVersion>${comparisonVersion}</comparisonVersion>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
+ </plugins>
|
||||
</build>
|
||||
--
|
||||
1.7.3.3
|
||||
|
||||
|
||||
<reporting>
|
||||
@@ -280,15 +215,7 @@
|
||||
</reportSets>
|
||||
</plugin>
|
||||
|
||||
- <plugin>
|
||||
- <groupId>org.codehaus.mojo</groupId>
|
||||
- <artifactId>clirr-maven-plugin</artifactId>
|
||||
- <configuration>
|
||||
- <comparisonVersion>${comparisonVersion}</comparisonVersion>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
-
|
||||
- </plugins>
|
||||
+ </plugins>
|
||||
</reporting>
|
||||
|
||||
</project>
|
||||
|
||||
@ -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 <akurtako@redhat.com> 4.1-1
|
||||
- Update to latest upstream version.
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user