diff --git a/SOURCES/0002-Set-Java-source-target-to-1.8.patch b/SOURCES/0002-Set-Java-source-target-to-1.8.patch new file mode 100644 index 0000000..b62e62e --- /dev/null +++ b/SOURCES/0002-Set-Java-source-target-to-1.8.patch @@ -0,0 +1,25 @@ +From 202fbfcbb7c179dcd40e7b296604febb10a8c256 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 21 Feb 2024 12:13:45 +0100 +Subject: [PATCH] Set Java source/target to 1.8 + +--- + build.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build.xml b/build.xml +index d5c2b54..cb1dfd1 100644 +--- a/build.xml ++++ b/build.xml +@@ -57,7 +57,7 @@ + token="+ version_str" + value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'> + +- ++ + + + +-- +2.43.0 + diff --git a/SOURCES/java_cup-build.patch b/SOURCES/java_cup-build.patch index 4fcfdbd..d1e400b 100644 --- a/SOURCES/java_cup-build.patch +++ b/SOURCES/java_cup-build.patch @@ -1,5 +1,5 @@ ---- build.xml~ 2014-06-12 17:23:24.000000000 +0200 -+++ build.xml 2015-06-23 10:30:57.374976304 +0200 +--- java_cup/build.xml~ 2014-06-12 17:23:24.000000000 +0200 ++++ java_cup/build.xml 2015-06-23 10:30:57.374976304 +0200 @@ -17,18 +17,6 @@ diff --git a/SPECS/java_cup.spec b/SPECS/java_cup.spec index 158e5e6..ff665b5 100644 --- a/SPECS/java_cup.spec +++ b/SPECS/java_cup.spec @@ -1,14 +1,15 @@ -%global pkg_version 11b -%global with_bootstrap 0 +%bcond_with bootstrap +%global pkg_version 11b Name: java_cup -Version: 0.11b -Release: 10%{?dist} Epoch: 1 +Version: 0.11b +Release: 52%{?dist} Summary: LALR parser generator for Java -License: MIT +License: SMLNJ URL: http://www2.cs.tum.edu/projects/cup/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch # svn export -r 65 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11b # tar cjf java_cup-0.11b.tar.bz2 java_cup-0.11b/ @@ -17,22 +18,26 @@ Source0: java_cup-%{version}.tar.bz2 Source2: %{name}-MANIFEST.MF Source4: %{name}-runtime-MANIFEST.MF -Patch0: %{name}-build.patch +Patch: %{name}-build.patch +Patch: 0002-Set-Java-source-target-to-1.8.patch -BuildRequires: ant +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: javapackages-local +BuildRequires: ant +BuildRequires: java_cup BuildRequires: jflex -BuildRequires: java_cup >= 1:0.11a - +%endif %description java_cup is a LALR Parser Generator for Java %package javadoc -Summary: Javadoc for java_cup +Summary: API documentation for %{name} %description javadoc -Javadoc for java_cup +API documentation for %{name}. %package manual Summary: Documentation for java_cup @@ -41,10 +46,7 @@ Summary: Documentation for java_cup Documentation for java_cup. %prep -%setup -q -%patch0 -b .build - -sed -i '/ - 1:0.11b-48 +- Drop explicit requires on javapackages-tools + +* Thu Jul 18 2024 Fedora Release Engineering - 1:0.11b-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Feb 29 2024 Jiri Vanek - 1:0.11b-30 +- bump of release for for java-21-openjdk as system jdk + +* Tue Feb 27 2024 Jiri Vanek - 1:0.11b-29 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Feb 21 2024 Marian Koncek - 1:0.11b-28 +- Set OpenJDK version to 1.8 + +* Wed Jan 24 2024 Fedora Release Engineering - 1:0.11b-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1:0.11b-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1:0.11b-25 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 1:0.11b-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1:0.11b-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1:0.11b-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1:0.11b-21 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1:0.11b-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1:0.11b-19 +- Bump Java compiler source/target levels to 1.7 + +* Thu Jul 22 2021 Fedora Release Engineering - 1:0.11b-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1:0.11b-17 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1:0.11b-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1:0.11b-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1:0.11b-14 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 25 2020 Roland Grunberg - 1:0.11b-13 +- Use source/target of 1.6 to build against Java 11. + +* Wed Jan 29 2020 Fedora Release Engineering - 1:0.11b-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 1:0.11b-10 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 1:0.11b-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 1:0.11b-9 - Mass rebuild for javapackages-tools 201901 +* Fri Feb 01 2019 Fedora Release Engineering - 1:0.11b-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1:0.11b-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1:0.11b-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild