SPECS/plexus-sec-dispatcher.spec

@@ -1,8 +1,6 @@
-%bcond_with bootstrap
-
 Name:           plexus-sec-dispatcher
 Version:        1.4
-Release:        39%{?dist}
+Release:        26%{?dist}
 Summary:        Plexus Security Dispatcher Component
 License:        ASL 2.0
 URL:            https://github.com/codehaus-plexus/plexus-sec-dispatcher
@@ -16,32 +14,30 @@ Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 # Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4.
 Patch0:         %{name}-pom.patch
 
-BuildRequires:  maven-local-openjdk8
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
+BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
-BuildRequires:  %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils)
-BuildRequires:  %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher)
-%endif
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-cipher)
+BuildRequires:  mvn(org.sonatype.spice:spice-parent:pom:)
 
 %description
 Plexus Security Dispatcher Component
 
-%{?module_package}
-%{?javadoc_package}
+%package javadoc
+Summary:        Javadoc for %{name}
+
+%description javadoc
+API documentation for %{name}.
 
 %prep
 %setup -q
-%patch -P 0 -p1
 
-cp %{SOURCE1} .
+%patch0 -p1
 
-%pom_remove_parent
-%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "<scope>test</scope>"
+cp %{SOURCE1} .
 
 %mvn_file : plexus/%{name}
 
@@ -51,60 +47,13 @@ cp %{SOURCE1} .
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
 %license LICENSE-2.0.txt
 
-%changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1.4-39
-- Fix patch usage
-
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.4-38
-- Rebuild with regenerated Requires on Java
-
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-37
-- Rebuild to regenerate auto-requires
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.4-36
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-35
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-34
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-33
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.4-30
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-29
-- Build with OpenJDK 8
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-28
-- Mass rebuild for javapackages-tools 201902
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-27
-- Mass rebuild for javapackages-tools 201901
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+%files javadoc -f .mfiles-javadoc
+%license LICENSE-2.0.txt
 
+%changelog
 * Tue Jul 31 2018 Michael Simacek <msimacek@redhat.com> - 1.4-26
 - Include license file