From a7c3fa08ff9cbdb690153d4ed543a79dd38a0374 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Jan 26 2018 03:51:49 +0000 Subject: Update to upstream version 43 --- diff --git a/.gitignore b/.gitignore index 0dfa970..c7a6b88 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ commons-parent-22.tar.xz /commons-parent-39.tar.xz /commons-parent-40.tar.xz /commons-parent-42.tar.xz +/commons-parent-43-src.zip diff --git a/apache-commons-parent.spec b/apache-commons-parent.spec index acf5160..248f07c 100644 --- a/apache-commons-parent.spec +++ b/apache-commons-parent.spec @@ -1,32 +1,29 @@ -%global short_name commons-parent - -Name: apache-%{short_name} -Version: 42 -Release: 4%{?dist} -Summary: Apache Commons Parent Pom -License: ASL 2.0 -URL: http://svn.apache.org/repos/asf/commons/proper/%{short_name}/tags/%{short_name}-%{version}/ - -# svn export http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-%{version} -# tar caf commons-parent-%{version}.tar.xz commons-parent-%{version} -Source0: %{short_name}-%{version}.tar.xz - -BuildArch: noarch - -BuildRequires: maven-local -BuildRequires: mvn(org.apache:apache:pom:) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -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) +Name: apache-commons-parent +Version: 43 +Release: 1%{?dist} +Summary: Apache Commons Parent Pom +License: ASL 2.0 +URL: http://svn.apache.org/repos/asf/commons/proper/commons-parent/tags/commons-parent-%{version}/ +BuildArch: noarch + +Source0: http://repo1.maven.org/maven2/org/apache/commons/commons-parent/%{version}/commons-parent-%{version}-src.zip + +BuildRequires: maven-local +BuildRequires: mvn(org.apache:apache:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +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 %{short_name}-%{version} +%setup -q -n commons-parent-%{version}-src # Plugin is not in fedora %pom_remove_plugin org.apache.commons:commons-build-plugin @@ -50,9 +47,13 @@ done %mvn_install %files -f .mfiles -%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt +%doc RELEASE-NOTES.txt +%license LICENSE.txt NOTICE.txt %changelog +* Fri Jan 26 2018 Mikolaj Izdebski - 43-1 +- Update to upstream version 43 + * Wed Jul 26 2017 Fedora Release Engineering - 42-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 349ee36..144b077 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-parent-42.tar.xz) = ed8e2cbd9dd5abf00122b4620ae8e4de9ae4e83b7cd68be85a978a882e81a7f44e1fa3f3c741e48d650820276687d214b9231fa91bfb57f7780e57fe72e3701c +SHA512 (commons-parent-43-src.zip) = 54c55d56ba9726f8a34c3ad216c227d23bad6977cfe3365e8e4a796645db36f41192cd7e0abf696711177195e5fbe0f7e97a5d4a1d23f29c6f5631583195d666