SPECS/regexp.spec

@@ -1,11 +1,12 @@
 Name:           regexp
 Epoch:          1
 Version:        1.5
-Release:        39%{?dist}
+Release:        48%{?dist}
 Summary:        Simple regular expressions API
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            http://jakarta.apache.org/%{name}/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        http://archive.apache.org/dist/jakarta/%{name}/jakarta-%{name}-%{version}.tar.gz
 Source2:        jakarta-%{name}-osgi-manifest.MF
@@ -14,6 +15,8 @@ Patch0:         jakarta-%{name}-attach-osgi-manifest.patch
 BuildRequires:  ant
 BuildRequires:  javapackages-local
 
+Provides:       deprecated()
+
 %description
 Regexp is a 100% Pure Java Regular Expression package that was
 graciously donated to the Apache Software Foundation by Jonathan Locke.
@@ -24,13 +27,14 @@ for visual debugging and testing suite for compatibility.
 
 %package javadoc
 Summary:        Javadoc for %{name}
+Provides:       deprecated()
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
 %setup -q -n jakarta-%{name}-%{version}
-%patch -P 0
+%patch 0
 cp -p %{SOURCE2} MANIFEST.MF
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
@@ -50,7 +54,7 @@ EOF
 
 %build
 mkdir lib
-%ant -Djakarta-site2.dir=. jar javadocs
+%ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar javadocs
 
 %mvn_artifact pom.xml build/*.jar
 
@@ -67,22 +71,54 @@ mkdir lib
 %doc LICENSE
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:1.5-39
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.5-48
-- Fix patch usage
+- Rebuilt for MSVSphere 10
+
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-48
+- Drop requires on java-headless
+
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-47
+- Switch Java compiler source/target to 1.8
+- Resolves: RHEL-52704
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:1.5-47
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.5-46
+- Bump release for June 2024 mass rebuild
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-45
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-43
+- Convert License tag to SPDX format
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-42
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-41
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Aug 05 2022 Marian Koncek <mkoncek@redhat.com> - 1:1.5-40
+- Explicitly specify JVM source and target version
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-39
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com>
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:1.5-38
-- Rebuild with regenerated Requires on Java
+- Rebuilt for java-17-openjdk as system jdk
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.5-37
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-37
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-  Related: rhbz#1991688
 
-* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-36
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-36
-- Remove deprecated() provides
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-- Resolves: rhbz#1977001
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.5-35
+* Sat Jul 10 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-35
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Workaround for RPM bug #646523 - can't change symlink to directory
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild