diff --git a/.gitignore b/.gitignore index 1f946aa..ae2b386 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /httpcomponents-project-4.1.1.tar.xz /httpcomponents-project-6.tar.xz /httpcomponents-project-7.tar.xz +/httpcomponents-parent-9.pom +/LICENSE-2.0.txt diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index 9dc905c..1756122 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,17 +1,16 @@ -Name: httpcomponents-project -Summary: Common POM file for HttpComponents -Version: 7 -Release: 6%{?dist} -Group: Development/Libraries -License: ASL 2.0 -URL: http://hc.apache.org/ -# 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 +Name: httpcomponents-project +Summary: Common POM file for HttpComponents +Version: 9 +Release: 1%{?dist} +License: ASL 2.0 +URL: http://hc.apache.org/ +Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/9/httpcomponents-parent-9.pom +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(org.apache:apache:pom:) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) %description @@ -20,13 +19,20 @@ required only for building dependant packages with Maven. Please don't use it as runtime requirement. %prep -%setup -q +%setup -q -T -c %{name} + +cp -p %{SOURCE0} pom.xml +cp -p %{SOURCE1} . + %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 %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :apache-rat-plugin + +# Version <= 8 had this AID +%mvn_alias : :project %build %mvn_file : %{name} @@ -36,9 +42,12 @@ use it as runtime requirement. %mvn_install %files -f .mfiles -%doc LICENSE.txt NOTICE.txt +%doc LICENSE-2.0.txt %changelog +* Sun Oct 22 2017 Michael Simacek - 9-1 +- Update to upstream version 9 + * Wed Jul 26 2017 Fedora Release Engineering - 7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index c516951..0af1b83 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -e5b0ebc3f30976063dace766999954f9 httpcomponents-project-7.tar.xz +SHA512 (httpcomponents-parent-9.pom) = 3de5f674b98e286021997641c585d7128f6e0ca192cd9c30f535c5e210d532cceb42145d6e99026c3b8fd9399ce6a4b5cd0de5bcac152ac09df2d288b10013f1 +SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8