1 changed files with 11 additions and 67 deletions
--- a/SPECS/byteman.spec
+++ b/SPECS/byteman.spec
@ -15,7 +15,7 @@

 Name:             byteman
 Version:          4.0.16
-Release:          17%{?dist}
+Release:          2%{?dist}
 Summary:          Java agent-based bytecode injection tool
 License:          LGPLv2+
 URL:              http://www.jboss.org/byteman
@ -23,10 +23,9 @@ URL:              http://www.jboss.org/byteman
 Source0:          https://github.com/bytemanproject/byteman/archive/%{version}.tar.gz

 BuildArch:        noarch
-ExclusiveArch:  %{java_arches} noarch

-# Byteman 4.x requires JDK 9+ to build.
-BuildRequires:    java-devel >= 1:11
+# Byteman 4.x requires JDK 9+ to build. Require JDK 10 explicitly.
+BuildRequires:    java-11-openjdk-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-shade-plugin
 BuildRequires:    maven-source-plugin
@ -48,7 +47,7 @@ BuildRequires:    junit5
 BuildRequires:    testng

 Provides:         bundled(objectweb-asm) = 9.1
-Provides:         bundled(java_cup) = 1:0.11b-17
+Provides:         bundled(java_cup) = 1:0.11b-19
 # We are filtering java-headless >= 1:1.9 requirement. Add
 # JDK 8 requirement here explicitly which shouldn't match the filter.
 Requires:         java-headless >= 1:1.8
@ -124,10 +123,6 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml
 %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:executions" contrib/bmunit
 %pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" '<skip>true</skip>' contrib/bmunit

-# source/target 1.6 is not supported by 17; default is now 1.8
-%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" pom.xml
-%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" pom.xml
-
 # Don't build download, docs modules
 %pom_disable_module download
 %pom_disable_module docs
@ -148,7 +143,7 @@ sed -i "s|java-cup|java_cup|" tests/pom.xml
 %mvn_package ":byteman-dtest" dtest

 %build
-export JAVA_HOME=/usr/lib/jvm/java-openjdk
+export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 # Use --xmvn-javadoc so as to avoid maven-javadoc-plugin issue
 # (fixed in 3.1.0, fedora has 3.0.1):
 # See https://issues.apache.org/jira/browse/MJAVADOC-555
@ -220,67 +215,16 @@ ln -s %{_javadir}/byteman/byteman.jar $RPM_BUILD_ROOT%{homedir}/lib/byteman.jar
 %{homedir}/lib/byteman-dtest.jar

 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.0.16-17
- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.0.16-17
- Bump release for June 2024 mass rebuild
-
-* Thu Jun 13 2024 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.16-16
- Bump release for test run.
-
-* Thu Jun 13 2024 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.16-15
- Bump release.
-
-* Sun Mar 03 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 4.0.16-14
- Really rebuild with java-21-openjdk as system jdk
-
-* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 4.0.16-13
- Rebuilt for java-21-openjdk as system jdk
-
-* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.16-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.16-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jul 19 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 4.0.16-10
- Build with Java 17
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.16-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.16-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Aug 10 2022 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.16-7
- Rebuild with latest maven-verifier-plugin
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.16-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 4.0.16-5
- Rebuilt for Drop i686 JDKs
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.0.16-4
- Rebuilt for java-17-openjdk as system jdk
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.16-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688

 * Fri Jun 18 2021 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.16-1
- Update to latest upstream 4.0.16 release.
+- Update to latest upstream 4.0.16 release for JDK 17 support.
 - Drop not-needed jboss-modules BR.

-* Mon May 31 2021 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.15-2
- Re-enable tests during build.
-
-* Mon May 31 2021 Severin Gehwolf <sgehwolf@redhat.com> - 4.0.15-1
- Update to latest upstream 4.0.15 release.
- Drop tests_pom_xml.patch now included upstream.
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 4.0.11-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.11-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild