From efd7947c7b7184b37bf7aed66dd4ed122083430e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Tue, 1 Sep 2020 21:47:36 +0200 Subject: [PATCH] update to version 52 --- .gitignore | 6 +++++- apache-commons-parent.spec | 37 ++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 227804b..5fd2b3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ +/results_* +/*.src.rpm + /commons-parent-15.tar.xz /commons-parent-20.tar.xz -commons-parent-22.tar.xz +/commons-parent-22.tar.xz /commons-parent-26.tar.xz /commons-parent-32.tar.xz /commons-parent-33.tar.xz @@ -13,3 +16,4 @@ commons-parent-22.tar.xz /commons-parent-42.tar.xz /commons-parent-43-src.zip /commons-parent-47.tar.gz +/commons-parent-52.tar.gz diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec index c0cba07..0f3848c 100644 --- a/apache-commons-parent.spec +++ b/apache-commons-parent.spec @@ -1,34 +1,39 @@ +%global srcname commons-parent + Name: apache-commons-parent -Version: 47 -Release: 6%{?dist} +Version: 52 +Release: 1%{?dist} Summary: Apache Commons Parent Pom License: ASL 2.0 -URL: https://commons.apache.org/commons-parent-pom.html BuildArch: noarch -Source0: https://github.com/apache/commons-parent/archive/commons-parent-%{version}.tar.gz +%global upstream_version rel/%{srcname}-%{version} +%global upstream_archive %{srcname}-rel-%{srcname}-%{version} + +URL: https://commons.apache.org/commons-parent-pom.html +Source0: https://github.com/apache/%{srcname}/archive/%{upstream_version}/%{srcname}-%{version}.tar.gz BuildRequires: maven-local -BuildRequires: java-11-openjdk-devel -BuildRequires: mvn(org.apache:apache:pom:) +BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) # Not generated automatically BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) Requires: mvn(org.codehaus.mojo:build-helper-maven-plugin) %description The Project Object Model files for the apache-commons packages. + %prep -%setup -q -n commons-parent-commons-parent-%{version} +%setup -q -n %{upstream_archive} # Plugin is not in fedora -%pom_remove_plugin org.apache.commons:commons-build-plugin -%pom_remove_plugin org.apache.maven.plugins:maven-scm-publish-plugin +%pom_remove_plugin :commons-build-plugin +%pom_remove_plugin :maven-scm-publish-plugin # Plugins useless in package builds %pom_remove_plugin :apache-rat-plugin @@ -42,19 +47,24 @@ for profile in animal-sniffer japicmp jacoco cobertura clirr; do %pom_xpath_remove "pom:profile[pom:id='$profile']" done + %build -export JAVA_HOME=/usr/lib/jvm/java-11 %mvn_build + %install -export JAVA_HOME=/usr/lib/jvm/java-11 %mvn_install + %files -f .mfiles -%doc RELEASE-NOTES.txt +%doc README.md RELEASE-NOTES.txt %license LICENSE.txt NOTICE.txt + %changelog +* Tue Sep 01 2020 Fabio Valentini - 52-1 +- Update to version 52. + * Mon Jul 27 2020 Fedora Release Engineering - 47-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -189,3 +199,4 @@ export JAVA_HOME=/usr/lib/jvm/java-11 * Wed Oct 20 2010 Chris Spike 15-1 - Initial version of the package + diff --git a/sources b/sources index d0b8680..348b09c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-parent-47.tar.gz) = 4982b5dd80658c79a985f62779025ee419e4fd5f6b1bc272a02b122c72e6f8f74e30267fe191c85ea03cf20c60f544157c39fe83297c3b11735f73ef33b648d7 +SHA512 (commons-parent-52.tar.gz) = d7ff5082c29f6d0297a11098b5df10811e83041bfbd9f0afba78b09d25e4446d604f3f2f29383ae2ed066d0e7d3f4b1a11ce0eb9443e84274d815e36ebff3b97