SPECS/junit.spec

@@ -3,12 +3,11 @@
 Name:           junit
 Epoch:          1
 Version:        4.13.1
-Release:        10%{?dist}
+Release:        7%{?dist}
 Summary:        Java regression test package
 License:        EPL-1.0
 URL:            http://www.junit.org/
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 # ./generate-tarball.sh
 Source0:        %{name}-%{version}.tar.gz
@@ -16,10 +15,10 @@ Source1:        generate-tarball.sh
 
 Patch1:         0001-Port-to-hamcrest-2.2.patch
 
+BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
@@ -53,7 +52,7 @@ Javadoc for %{name}.
 %prep
 %setup -q -n junit4-r%{version}
 
-%patch1 -p1
+%patch -P 1 -p1
 
 # InaccessibleBaseClassTest fails with Java 8
 sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java
@@ -85,10 +84,8 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
 
 %mvn_file : %{name}
 
-%mvn_alias junit:junit junit:junit-dep
-
 %build
-%mvn_build -- -DjdkVersion=1.7 -P\!restrict-doclint
+%mvn_build -- -DjdkVersion=1.6
 
 %install
 %mvn_install
@@ -105,32 +102,21 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
 %doc doc/*
 
 %changelog
-* Tue May 07 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:4.13.1-10
-- Rebuilt for MSVSphere 8.9
-
-* Thu Feb 08 2024 Marián Konček <mkoncek@redhat.com> - 1:4.13.1-10
-- Rebuild to regenerate auto-requires
-
-* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.13.1-9
-- Rebuild to regenerate auto-requires
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:4.13.1-7
-- Rebuilt for java-17-openjdk as system jdk
+* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:4.13.1-7
+- Fix patch usage
 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Tue Nov 19 2024 Marián Konček <mkoncek@redhat.com> - 1:4.13.1-6
+- Rebuild with regenerated Requires on Java
 
-* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.13.1-5
-- Bump Java compiler source/target levels to 1.7
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.13.1-5
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Tue Sep 15 2021 Didik Supriadi <didiksupriadi41@gmail.com> - 1:4.13.1-4
-- Add alias for junit-dep
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.13.1-4
+- Rebuild to workaround DistroBaker issue
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.13.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.13.1-3
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:4.13.1-2
 - Bootstrap build
@@ -250,7 +236,7 @@ sed s/@version@/%{version}/ src/main/java/junit/runner/Version.java.template >sr
 
 * Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:4.11-4
 - Rebuild to regenerate API documentation
-- Resolves CVE-2013-1571
+- Resolves: CVE-2013-1571
 
 * Fri Jun 21 2013 Michal Srb <msrb@redhat.com> - 0:4.11-3
 - Build from clean tarball