SPECS/regexp.spec

@@ -1,12 +1,11 @@
 Name:           regexp
 Epoch:          1
 Version:        1.5
-Release:        42%{?dist}
+Release:        28%{?dist}
 Summary:        Simple regular expressions API
 License:        ASL 2.0
 URL:            http://jakarta.apache.org/%{name}/
 BuildArch:      noarch
-ExclusiveArch:  aarch64 ppc64le s390x x86_64 noarch
 
 Source0:        http://archive.apache.org/dist/jakarta/%{name}/jakarta-%{name}-%{version}.tar.gz
 Source2:        jakarta-%{name}-osgi-manifest.MF
@@ -15,6 +14,8 @@ Patch0:         jakarta-%{name}-attach-osgi-manifest.patch
 BuildRequires:  ant
 BuildRequires:  javapackages-local
 
+Requires:       java-headless
+
 %description
 Regexp is a 100% Pure Java Regular Expression package that was
 graciously donated to the Apache Software Foundation by Jonathan Locke.
@@ -31,7 +32,7 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n jakarta-%{name}-%{version}
-%patch -P 0
+%patch0
 cp -p %{SOURCE2} MANIFEST.MF
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
@@ -51,7 +52,7 @@ EOF
 
 %build
 mkdir lib
-%ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar javadocs
+%ant -Djakarta-site2.dir=. jar javadocs
 
 %mvn_artifact pom.xml build/*.jar
 
@@ -61,70 +62,25 @@ mkdir lib
 %check
 %ant -Djakarta-site2.dir=. test
 
+# Workaround for RPM bug #646523 - can't change symlink to directory
+# TODO: Remove this in F-23
+%pretrans javadoc -p <lua>
+dir = "%{_javadocdir}/%{name}"
+dummy = posix.readlink(dir) and os.remove(dir)
+
 %files -f .mfiles
-%license LICENSE
+%doc LICENSE
 
 %files javadoc -f .mfiles-javadoc
-%license LICENSE
+%doc LICENSE
 
 %changelog
-* Wed Dec 04 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-42
-- Update Java source/target to 1.8
-- Install license files in licensedir instead of docdir
-
-* Sat Nov 23 2024 Marián Konček <mkoncek@redhat.com> - 1:1.5-41
-- Add noarch to ExclusiveArch
-
-* Fri Nov 22 2024 Marián Konček <mkoncek@redhat.com> - 1:1.5-40
-- Disable building on i686
-
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:1.5-39
-- Fix patch usage
-
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com>
-- Rebuild with regenerated Requires on Java
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.5-37
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-36
-- Remove deprecated() provides
-- Resolves: rhbz#1977001
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.5-35
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1:1.5-32
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-31
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-28
 - Mass rebuild for javapackages-tools 201902
 
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-27
 - Mass rebuild for javapackages-tools 201901
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 21 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-28
-- Mark package as deprecated
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.5-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild