diff --git a/0001-Remove-dependency-on-junit-addons.patch b/0001-Remove-dependency-on-junit-addons.patch index 8dc2a81..fbf1701 100644 --- a/0001-Remove-dependency-on-junit-addons.patch +++ b/0001-Remove-dependency-on-junit-addons.patch @@ -13,8 +13,8 @@ diff --git a/pom.xml b/pom.xml index d46a817..6b6295c 100644 --- a/pom.xml +++ b/pom.xml -@@ -140,12 +140,6 @@ - 4.13.1 +@@ -151,12 +151,6 @@ + 4.13.2 test - @@ -69,4 +69,3 @@ index cdb9299..e8dce8f 100644 List result = applyPattern( pattern ); -- 2.34.1 - diff --git a/maven-reporting-impl.spec b/maven-reporting-impl.spec index 28c080f..3f5323d 100644 --- a/maven-reporting-impl.spec +++ b/maven-reporting-impl.spec @@ -1,14 +1,14 @@ Name: maven-reporting-impl -Version: 3.1.0 -Release: 3%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Abstract classes to manage report generation -License: ASL 2.0 +License: Apache-2.0 URL: https://maven.apache.org/shared/maven-reporting-impl/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch -Source0: https://www.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip -Source1: https://www.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip.asc +Source0: https://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip +Source1: https://archive.apache.org/dist/maven/reporting/%{name}-%{version}-source-release.zip.asc # Apache Maven public key Source2: https://www.apache.org/dist/maven/KEYS # Fedora does not have junit-addons @@ -41,6 +41,11 @@ Abstract classes to manage report generation, which can be run both: %{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2} %autosetup -p1 +# Fix end of line encoding +sed -i.orig 's/\\r//' README.md +touch -r README.md.orig README.md +rm README.md.orig + # integration tests try to download stuff from the internet # and therefore they don't work in Koji %pom_remove_plugin :maven-invoker-plugin @@ -56,6 +61,10 @@ Abstract classes to manage report generation, which can be run both: %license LICENSE NOTICE %changelog +* Mon Nov 28 2022 Jerry James - 3.2.0-1 +- Version 3.2.0 +- Convert License tag to SPDX + * Thu Jul 21 2022 Fedora Release Engineering - 3.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 1641b62..8b696fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (maven-reporting-impl-3.1.0-source-release.zip) = 8f7012a05db0486e41eb62ac423fce6a65b75e525ec11a20b6279c5f7280191d039ca9ad48f424d86ee55e436fb848c91fea401d4e9f931a754180a9a919ac76 -SHA512 (maven-reporting-impl-3.1.0-source-release.zip.asc) = 600b8208ef02210ccbf561eb72a9449d81bbf714820b4b97086fdfd24257a5a88009324a053a4bc39e2baad7dfb5595eb0f639de8fce9d86368cef1eeefeb69c +SHA512 (maven-reporting-impl-3.2.0-source-release.zip) = 07bc084657a6b550651d7e3e70186a8546aa84874d8204f9ca612342404f95cc1b50ffa2fe714d5a0feea3194fadba11d13379b8acf4364ecaf2f65ae8322f19 +SHA512 (maven-reporting-impl-3.2.0-source-release.zip.asc) = 82121ea2e1f67afb07ae37241bb8c808f746dea0d11db1c7ed34252ab1aa6278f58aebf8a2ba865cc420eed9e3c52366dc01bf02a52b8b164b205675fc8871c9