From af4a74693fa0da2fc176ae91f579842b42f42907 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 13:48:59 +0000 Subject: [PATCH] import CS apache-parent-33-5.module_el9+1171+eb38a622 --- .apache-parent.metadata | 2 +- .gitignore | 2 +- SPECS/apache-parent.spec | 132 +++++++++++++++++++++++++++++++++++---- 3 files changed, 121 insertions(+), 15 deletions(-) diff --git a/.apache-parent.metadata b/.apache-parent.metadata index c47b97a..350fb7a 100644 --- a/.apache-parent.metadata +++ b/.apache-parent.metadata @@ -1 +1 @@ -38e6f20de4e4f6987720d8b236d2cb78360f9a8f SOURCES/apache-21-source-release.zip +de0bb0f40fa6c7f174c8eb6ccf15480c23c5b8fe SOURCES/apache-33-source-release.zip diff --git a/.gitignore b/.gitignore index a9fe68d..6d7031d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/apache-21-source-release.zip +SOURCES/apache-33-source-release.zip diff --git a/SPECS/apache-parent.spec b/SPECS/apache-parent.spec index 26f1def..2ea5af4 100644 --- a/SPECS/apache-parent.spec +++ b/SPECS/apache-parent.spec @@ -1,27 +1,38 @@ -Name: apache-parent -Version: 21 -Release: 3%{?dist} -Summary: Parent POM file for Apache projects -License: ASL 2.0 -URL: http://apache.org/ -Source0: http://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip -BuildArch: noarch +%bcond_with bootstrap +Name: apache-parent +Version: 33 +Release: 5%{?dist} +Summary: Parent POM file for Apache projects +License: Apache-2.0 +URL: https://apache.org/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) - +%endif +%if %{without bootstrap} # Not generated automatically -BuildRequires: mvn(org.apache:apache-jar-resource-bundle) -Requires: mvn(org.apache:apache-jar-resource-bundle) +BuildRequires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) +%endif +Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) %description This package contains the parent pom file for apache projects. %prep -%setup -n apache-%{version} +%autosetup -p1 -n apache-%{version} %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-site-plugin docs +%pom_remove_plugin :maven-scm-publish-plugin docs %build %mvn_build @@ -30,18 +41,113 @@ This package contains the parent pom file for apache projects. %mvn_install %files -f .mfiles -%doc LICENSE NOTICE +%license LICENSE NOTICE %changelog +* Mon Dec 30 2024 Mikolaj Izdebski - 33-3 +- Use %%autosetup -C + +* Fri Nov 29 2024 Mikolaj Izdebski - 33-2 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 33-1 +- Update to upstream version 33 +- Resolves: rhbz#2296782 + +* Wed Jul 17 2024 Fedora Release Engineering - 31-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 31-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 31-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 31-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 31-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 08 2023 Marian Koncek - 31-1 +- Update to upstream version 31 + +* Fri Sep 01 2023 Mikolaj Izdebski - 30-2 +- Rebuild + +* Fri Aug 11 2023 Marian Koncek - 30-1 +- Update to upstream version 30 + +* Wed Jul 19 2023 Fedora Release Engineering - 27-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 27-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Sep 06 2022 Marian Koncek - 27-1 +- Update to upstream version 27 + +* Wed Jul 20 2022 Fedora Release Engineering - 26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Apr 27 2022 Mikolaj Izdebski - 26-2 +- Workaround build issue with RPM 4.18 + +* Thu Apr 21 2022 Mikolaj Izdebski - 26-1 +- Update to upstream version 26 + +* Sat Feb 05 2022 Jiri Vanek - 23-8 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 23-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 23-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 23-5 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 23-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 23-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 23-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Mar 02 2020 Fabio Valentini - 23-1 +- Update to version 23. + +* Wed Jan 29 2020 Marian Koncek - 23-1 +- Update to upstream version 23 + +* Tue Jan 28 2020 Fedora Release Engineering - 22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 17 2020 Fabio Valentini - 22-1 +- Update to version 22. + * Tue Nov 05 2019 Mikolaj Izdebski - 21-3 - Mass rebuild for javapackages-tools 201902 +* Wed Jul 24 2019 Fedora Release Engineering - 21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 21-2 - Mass rebuild for javapackages-tools 201901 * Tue May 14 2019 Mikolaj Izdebski - 21-1 - Update to upstream version 21 +* Thu Jan 31 2019 Fedora Release Engineering - 19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 19-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 19-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild