From 1760eb544b37242119ae9358b001512666938201 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 18 Sep 2020 14:44:18 +0200 Subject: [PATCH] Update to upstream version 12 --- .gitignore | 1 + httpcomponents-project.spec | 18 +++++++++--------- sources | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 898ac94..872ad6f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /httpcomponents-parent-9.pom /LICENSE-2.0.txt /httpcomponents-parent-11.pom +/httpcomponents-parent-12-source-release.zip diff --git a/httpcomponents-project.spec b/httpcomponents-project.spec index f2b4b99..06c1ca9 100644 --- a/httpcomponents-project.spec +++ b/httpcomponents-project.spec @@ -1,30 +1,27 @@ Name: httpcomponents-project Summary: Common POM file for HttpComponents -Version: 11 -Release: 2%{?dist} +Version: 12 +Release: 1%{?dist} License: ASL 2.0 -URL: http://hc.apache.org/ -Source0: http://archive.apache.org/dist/httpcomponents/httpcomponents-parent/%{version}/httpcomponents-parent-%{version}.pom -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +URL: https://hc.apache.org/ +Source0: https://archive.apache.org/dist/httpcomponents/httpcomponents-parent/httpcomponents-parent-%{version}-source-release.zip +Source1: https://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 Common Maven POM file for HttpComponents. This project should be required only for building dependant packages with Maven. Please don't use it as runtime requirement. %prep -%setup -q -T -c %{name} +%setup -q -n httpcomponents-parent-%{version} -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-site-plugin @@ -45,6 +42,9 @@ cp -p %{SOURCE1} . %doc LICENSE-2.0.txt %changelog +* Fri Sep 18 2020 Marian Koncek - 12-1 +- Update to upstream version 12 + * Tue Nov 05 2019 Mikolaj Izdebski - 11-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 73cbe48..1b3acd6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (httpcomponents-parent-11.pom) = bc676698caec72d525b9bf408432e9cd9c7b5d2227e0778fd79c303041cb5b07b88f98433d59c0149d6c11c27c3834722ceb283048919e467785efd7f4c399a2 +SHA512 (httpcomponents-parent-12-source-release.zip) = ba0cc569643439387b1a4912e7199ecaefbf836239bb389d8f0f13d93a078728100e570271eb87b17f1de2d79f295883ff2ad91953578b89b2ea45f158f2d5b1 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8