diff --git a/javac-1.8.patch b/javac-1.8.patch deleted file mode 100644 index 2e10999..0000000 --- a/javac-1.8.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/build.xml b/build.xml -index 8abb466..945f41d 100755 ---- a/build.xml -+++ b/build.xml -@@ -16,7 +16,7 @@ - - - -- -+ - - - -@@ -31,7 +31,7 @@ - - - -- -+ - - - diff --git a/jtidy.spec b/jtidy.spec index 8cc50f8..ee1c61a 100644 --- a/jtidy.spec +++ b/jtidy.spec @@ -1,6 +1,6 @@ Name: jtidy Version: 1.0 -Release: 0.49.20100930svn1125%{?dist} +Release: 0.29.20100930svn1125%{?dist} Epoch: 2 Summary: HTML syntax checker and pretty printer License: zlib @@ -9,14 +9,10 @@ URL: http://jtidy.sourceforge.net/ # tar caf jtidy.tar.xz jtidy Source0: %{name}.tar.xz Source1: %{name}.jtidy.script - -Patch0: javac-1.8.patch - BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant-openjdk25 +BuildRequires: javapackages-local +BuildRequires: ant BuildRequires: mvn(xerces:dom3-xml-apis) # Explicit javapackages-tools requires since jtidy script uses # /usr/share/java-utils/java-functions @@ -38,10 +34,9 @@ This package contains %{summary}. %prep %setup -q -n %{name} -%patch -P0 -p1 %build -ant +ant -Dant.build.javac.source=1.4 %install %mvn_file : %{name} @@ -71,66 +66,6 @@ EOF %changelog -* Tue Jul 29 2025 jiri vanek - 2:1.0-0.49.20100930svn1125 -- Rebuilt for java-25-openjdk as preffered jdk - -* Thu Jul 24 2025 Fedora Release Engineering - 2:1.0-0.48.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 2:1.0-0.47.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 2:1.0-0.46.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 2:1.0-0.45.20100930svn1125 -- Rebuilt for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 2:1.0-0.44.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 2:1.0-0.43.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 2:1.0-0.42.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 2:1.0-0.41.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2:1.0-0.40.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 2:1.0-0.39.20100930svn1125 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 2:1.0-0.38.20100930svn1125 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 2:1.0-0.37.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 2:1.0-0.36.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2:1.0-0.35.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 2:1.0-0.34.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jul 19 2020 Fabio Valentini - 2:1.0-0.33.20100930svn1125 -- Set javac source and target to 1.8 to fix Java 11 builds. - -* Fri Jul 10 2020 Jiri Vanek - 2:1.0-0.32.20100930svn1125 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering - 2:1.0-0.31.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2:1.0-0.30.20100930svn1125 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Fri Feb 01 2019 Fedora Release Engineering - 2:1.0-0.29.20100930svn1125 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild