Update to upstream version 6
This commit is contained in:
Mikolaj Izdebski
parent
6a1b76083a
commit
ba47e371ad
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/httpcomponents-project-4.1.1.tar.xz
|
||||
/httpcomponents-project-6.tar.xz
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
From ce430c0efe010c788f526a9285d7ac6d749d16b7 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Mon, 20 Dec 2010 12:40:34 +0100
|
||||
Subject: [PATCH] Clean pom
|
||||
|
||||
---
|
||||
pom.xml | 33 +--------------------------------
|
||||
1 files changed, 1 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 733b214..73d6a15 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -411,42 +411,11 @@
|
||||
</plugin>
|
||||
<!-- Other plugins, alpha order by groupId and artifactId -->
|
||||
<plugin>
|
||||
- <groupId>com.agilejava.docbkx</groupId>
|
||||
- <artifactId>docbkx-maven-plugin</artifactId>
|
||||
- <version>2.0.10</version>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <groupId>com.atlassian.maven.plugins</groupId>
|
||||
- <artifactId>maven-clover2-plugin</artifactId>
|
||||
- <version>2.6.3</version>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<version>2.1.0</version>
|
||||
</plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.codehaus.mojo</groupId>
|
||||
- <artifactId>clirr-maven-plugin</artifactId>
|
||||
- <version>2.2.3</version>
|
||||
- </plugin>
|
||||
- <plugin>
|
||||
- <artifactId>maven-notice-plugin</artifactId>
|
||||
- <groupId>org.apache.httpcomponents</groupId>
|
||||
- <version>0.0.2</version>
|
||||
- <executions>
|
||||
- <execution>
|
||||
- <id>attach-notice-license</id>
|
||||
- <goals>
|
||||
- <goal>generate</goal>
|
||||
- </goals>
|
||||
- </execution>
|
||||
- </executions>
|
||||
- <configuration>
|
||||
- <projectTitle>Apache HttpComponents</projectTitle>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
+ </plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
|
||||
--
|
||||
1.7.3.3
|
||||
|
||||
@ -1,46 +1,26 @@
|
||||
Name: httpcomponents-project
|
||||
Summary: Common POM file for HttpComponents
|
||||
Version: 4.1.1
|
||||
Release: 5%{?dist}
|
||||
Version: 6
|
||||
Release: 1%{?dist}
|
||||
Group: Development/Libraries
|
||||
License: ASL 2.0
|
||||
URL: http://hc.apache.org/
|
||||
# svn export -r 1050387 http://svn.apache.org/repos/asf/httpcomponents/project httpcomponents-project-4.1.1
|
||||
# tar cJvf httpcomponents-project-4.1.1.tar.xz httpcomponents-project-4.1.1
|
||||
Source0: httpcomponents-project-%{version}.tar.xz
|
||||
Patch0: 0001-Clean-pom.patch
|
||||
# svn export http://svn.apache.org/repos/asf/httpcomponents/project/tags/%{version} %{name}-%{version}
|
||||
# tar cJf %{name}-%{version}.tar.xz %{name}-%{version}
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: java-devel >= 1:1.6.0
|
||||
BuildRequires: jpackage-utils
|
||||
|
||||
# Requires are dependencies from pom.xml. This project should only be required for building with maven.
|
||||
Requires: java >= 1:1.6.0
|
||||
Requires: jpackage-utils
|
||||
Requires: maven
|
||||
Requires: maven-antrun-plugin
|
||||
Requires: maven-assembly-plugin
|
||||
Requires: maven-clean-plugin
|
||||
Requires: maven-compiler-plugin
|
||||
Requires: maven-deploy-plugin
|
||||
Requires: maven-gpg-plugin
|
||||
Requires: maven-install-plugin
|
||||
Requires: maven-jar-plugin
|
||||
Requires: maven-javadoc-plugin
|
||||
Requires: maven-plugin-jxr
|
||||
Requires: maven-project-info-reports-plugin
|
||||
Requires: maven-release-plugin
|
||||
Requires: maven-resources-plugin
|
||||
Requires: maven-site-plugin
|
||||
Requires: maven-source-plugin
|
||||
Requires: maven-surefire-plugin
|
||||
Requires: maven-surefire-report-plugin
|
||||
Requires: maven-release-plugin
|
||||
Requires: maven-plugin-jxr
|
||||
Requires: maven-plugin-bundle
|
||||
|
||||
Requires(post): jpackage-utils
|
||||
Requires(postun): jpackage-utils
|
||||
|
||||
%description
|
||||
Common Maven POM file for HttpComponents. This project should be
|
||||
@ -49,25 +29,26 @@ use it as runtime requirement.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%pom_remove_plugin :buildnumber-maven-plugin
|
||||
%pom_remove_plugin :clirr-maven-plugin
|
||||
%pom_remove_plugin :docbkx-maven-plugin
|
||||
%pom_remove_plugin :maven-clover2-plugin
|
||||
%pom_remove_plugin :maven-notice-plugin
|
||||
|
||||
%install
|
||||
%{__install} -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.httpcomponents-project.pom
|
||||
%add_to_maven_depmap org.apache.httpcomponents project %{version} JPP/httpcomponents project
|
||||
|
||||
%post
|
||||
%update_maven_depmap
|
||||
|
||||
%postun
|
||||
%update_maven_depmap
|
||||
install -dm 755 %{buildroot}/%{_mavenpomdir}
|
||||
install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
|
||||
%add_maven_depmap JPP.%{name}.pom
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE.txt
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
%{_mavendepmapfragdir}/%{name}
|
||||
%{_mavenpomdir}/JPP.%{name}.pom
|
||||
|
||||
%changelog
|
||||
* Mon Aug 6 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 6-1
|
||||
- Update to upstream version 6
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user