SPECS/plexus-utils.spec

@@ -1,8 +1,6 @@
-%bcond_with bootstrap
-
 Name:           plexus-utils
 Version:        3.3.0
-Release:        10%{?dist}
+Release:        3%{?dist}
 Summary:        Plexus Common Utilities
 # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ 
 # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory
@@ -15,19 +13,14 @@ Summary:        Plexus Common Utilities
 License:        ASL 1.1 and ASL 2.0 and xpp and BSD and Public Domain
 URL:            https://codehaus-plexus.github.io/plexus-utils/
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
 Source1:        http://apache.org/licenses/LICENSE-2.0.txt
 
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap-openjdk8
-%else
 BuildRequires:  maven-local-openjdk8
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
-%endif
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -37,6 +30,7 @@ reusable components for hibernate, form processing, jndi, i18n,
 velocity, etc. Plexus also includes an application server which
 is like a J2EE application server, without all the baggage.
 
+%{?module_package}
 %{?javadoc_package}
 
 %prep
@@ -68,38 +62,10 @@ cp %{SOURCE1} .
 %install
 %mvn_install
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
 %license NOTICE.txt LICENSE-2.0.txt
 
 %changelog
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.3.0-9
-- Rebuilt for java-17-openjdk as system jdk
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-6
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 3.3.0-3
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-3
 - Build with OpenJDK 8
 
@@ -109,30 +75,15 @@ cp %{SOURCE1} .
 * Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 3.3.0-1
 - Update to upstream verssion 3.3.0
 
-* Wed Oct 16 2019 Fabio Valentini <decathorpe@gmail.com> - 3.3.0-1
-- Update to version 3.3.0.
-
-* Fri Oct 11 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.1-1
-- Update to version 3.2.1.
-
 * Mon Jul 29 2019 Marian Koncek <mkoncek@redhat.com> - 3.2.1-1
 - Update to upstream version 3.2.1
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jul 03 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.0-1
-- Update to version 3.2.0.
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
 - Mass rebuild for javapackages-tools 201901
 
 * Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-1
 - Update to upstream version 3.2.0
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild