SPECS/bsf.spec

@@ -1,12 +1,13 @@
 Name:           bsf
 Version:        2.4.0
-Release:        45%{?dist}
+Release:        54%{?dist}
 Summary:        Bean Scripting Framework
-License:        ASL 2.0
+License:        Apache-2.0
-URL:            http://commons.apache.org/bsf/
+URL:            https://commons.apache.org/bsf/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-Source0:        http://apache.mirror.anlx.net//commons/%{name}/source/%{name}-src-%{version}.tar.gz
+Source0:        https://archive.apache.org/dist/commons/bsf/source/bsf-src-%{version}.tar.gz
 Source1:        %{name}-pom.xml
 
 Patch0:         build-file.patch
@@ -18,6 +19,8 @@ BuildRequires:  apache-parent
 BuildRequires:  xalan-j2
 BuildRequires:  apache-commons-logging
 
+%{?javadoc_package}
+
 %description
 Bean Scripting Framework (BSF) is a set of Java classes which provides
 scripting language support within Java applications, and access to Java
@@ -46,43 +49,76 @@ engines:
 
 %prep
 %setup -q
-%patch -P 0 -p1
+%patch0 -p1
-%patch -P 1 -p1
+%patch1 -p1
 find -name \*.jar -delete
 
 %mvn_file : %{name}
 %mvn_alias : org.apache.bsf:
 
 %build
-export CLASSPATH=$(build-classpath apache-commons-logging xalan-j2)
+build-jar-repository -s lib apache-commons-logging xalan-j2
-ant -Dsource.level=1.6 jar
+%ant -Dsource.level=1.8 -Dant.build.javac.target=1.8 jar javadocs
 
 %mvn_artifact %{SOURCE1} build/lib/%{name}.jar
 
 %install
-%mvn_install
+%mvn_install -J build/javadocs
 
 %files -f .mfiles
 %license LICENSE.txt NOTICE.txt
 %doc AUTHORS.txt CHANGES.txt README.txt TODO.txt RELEASE-NOTE.txt
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 2.4.0-45
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.4.0-54
-- Fix patch usage
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.4.0-53
+- Rebuilt for MSVSphere 10
+
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-53
+- Switch Java compiler source/target to 1.8
+- Resolves: RHEL-52687
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.4.0-53
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.4.0-52
+- Bump release for June 2024 mass rebuild
+
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-51
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-50
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-49
+- Convert License tag to SPDX format
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-48
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-47
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Aug 05 2022 Marian Koncek <mkoncek@redhat.com> - 2.4.0-46
+- Explicitly specify JVM target version
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Tue Nov 19 2024 Marián Konček <mkoncek@redhat.com> - 2.4.0-44
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.4.0-44
-- Rebuild with regenerated Requires on Java
+- Rebuilt for java-17-openjdk as system jdk
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.0-43
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-43
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-  Related: rhbz#1991688
 
-* Mon Jun 21 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-42
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-42
-- Remove dependency on rhino
+- Bump Java compiler source/target levels to 1.7
-- Resolves: rhbz#1971743
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0:2.4.0-41
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-41
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.4.0-40
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild