SPECS/xml-commons-resolver.spec

@@ -1,6 +1,6 @@
 Name:           xml-commons-resolver
 Version:        1.2
-Release:        39%{?dist}
+Release:        28%{?dist}
 Summary:        Resolver subproject of xml-commons
 License:        ASL 2.0
 URL:            http://xerces.apache.org/xml-commons/components/resolver/
@@ -33,8 +33,8 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
-%patch -P 0 -p1
-%patch -P 1 -p1
+%patch0 -p1
+%patch1 -p1
 
 # remove all binary libs and prebuilt javadocs
 find . -name "*.jar" -exec rm -f {} \;
@@ -44,7 +44,7 @@ sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt
 %mvn_file : xml-commons-resolver xml-resolver
 
 %build
-%ant -f resolver.xml jar javadocs -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
+%ant -f resolver.xml jar javadocs
 %mvn_artifact %{SOURCE5} build/resolver.jar
 
 %install
@@ -71,53 +71,12 @@ install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1
 %doc LICENSE.resolver.txt NOTICE-resolver.txt
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1.2-39
-- Fix patch usage
-
-* Tue Nov 19 2024 Marián Konček <mkoncek@redhat.com> - 1.2-38
-- Rebuild with regenerated Requires on Java
-
-* Fri Nov 08 2024 Marián Konček <mkoncek@redhat.com> - 1.2-37
-- Rebuild with regenerated Requires on Java
-
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.2-36
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-35
-- Convert sources to SHA512
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0:1.2-34
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.2-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.2-32
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Mat Booth <mat.booth@redhat.com> - 0:1.2-31
-- Generate 1.8 level bytecode to avoid breaking dependent packages that require
-  Java 8
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.2-30
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.2-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-28
 - Mass rebuild for javapackages-tools 201902
 
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.2-28
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-27
 - Mass rebuild for javapackages-tools 201901
 
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.2-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Wed Aug 01 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:1.2-26
 - Add requirement on javapackages-tools since scripts use
   java-functions.