From 12b8ee750e671183687461f13bc4b03c5c814777 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 21 Feb 2024 12:18:09 +0100 Subject: [PATCH 01/25] Set OpenJDK version to 1.8 --- 0002-Set-Java-source-target-to-1.8.patch | 25 ++++++++++++++++++++++++ java_cup.spec | 11 +++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 0002-Set-Java-source-target-to-1.8.patch diff --git a/0002-Set-Java-source-target-to-1.8.patch b/0002-Set-Java-source-target-to-1.8.patch new file mode 100644 index 0000000..b62e62e --- /dev/null +++ b/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/java_cup.spec b/java_cup.spec index 6a5fbc3..6198101 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 27%{?dist} +Release: 28%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: SMLNJ @@ -20,6 +20,7 @@ Source2: %{name}-MANIFEST.MF Source4: %{name}-runtime-MANIFEST.MF Patch0: %{name}-build.patch +Patch1: 0002-Set-Java-source-target-to-1.8.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -52,9 +53,8 @@ Documentation for java_cup. %prep %setup -q -%patch0 -b .build - -sed -i '/ - 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 From a0f3e58899978868ccf8e0343633025790457b9b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:06:21 +0100 Subject: [PATCH 02/25] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 6198101..0ec717b 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 28%{?dist} +Release: 29%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: SMLNJ @@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From 67ac83ebfb4b00dd88812ff8ec6fc202fc1b42f3 Mon Sep 17 00:00:00 2001 From: Jiri Date: Thu, 29 Feb 2024 18:40:16 +0100 Subject: [PATCH 03/25] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 0ec717b..5d22da6 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 29%{?dist} +Release: 30%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: SMLNJ @@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From 7b46ffc10b86b705a58bd2fc9f8d89c1805d511a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Jun 2024 13:34:35 +0200 Subject: [PATCH 04/25] Extract smoke tests out of test plan We want tests to be stored directly in the file system instead of being embedded into tests plans. --- plans/smoke.fmf | 6 +----- tests/Sanity/smoke/empty.cup | 2 ++ tests/Sanity/smoke/main.fmf | 6 ++++++ tests/Sanity/smoke/runtest.sh | 28 ++++++++++++++++++++++++++++ tests/main.fmf | 4 ++++ 5 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 tests/Sanity/smoke/empty.cup create mode 100644 tests/Sanity/smoke/main.fmf create mode 100755 tests/Sanity/smoke/runtest.sh create mode 100644 tests/main.fmf diff --git a/plans/smoke.fmf b/plans/smoke.fmf index 6faab89..a1e7bfd 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,9 +1,5 @@ summary: Basic smoke test discover: - how: shell - tests: - - name: /smoke/empty-grammar - test: | - echo 'non terminal bar; bar::=;' | cup + how: fmf execute: how: tmt diff --git a/tests/Sanity/smoke/empty.cup b/tests/Sanity/smoke/empty.cup new file mode 100644 index 0000000..479f98e --- /dev/null +++ b/tests/Sanity/smoke/empty.cup @@ -0,0 +1,2 @@ +non terminal bar; +bar::=; diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..b9bed52 --- /dev/null +++ b/tests/Sanity/smoke/main.fmf @@ -0,0 +1,6 @@ +summary: java_cup smoke test +description: | + Test basic functionality of java_cup. +require: + - java_cup + - java-21-openjdk-devel diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..838cfcd --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# Author: Mikolaj Izdebski +. /usr/share/beakerlib/beakerlib.sh + +rlJournalStart + + rlPhaseStartTest "check for presence of cup command" + rlAssertRpm java_cup + rlAssertBinaryOrigin cup java_cup + rlPhaseEnd + + rlPhaseStartTest "display cup version" + rlRun -s "cup -version" 1 + rlAssertGrep "CUP v0" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "generate parser for empty grammar" + java_home=/usr/lib/jvm/java-21-openjdk/bin + jar=/usr/share/java/java_cup-runtime.jar + rlRun -s "cup empty.cup" + rlAssertGrep "0 errors and 0 warnings" $rlRun_LOG + rlAssertGrep "2 terminals, 1 non-terminal, and 2 productions declared" $rlRun_LOG + rlAssertGrep "Code written to" $rlRun_LOG + rlRun "javac -cp ${jar} parser.java sym.java" + rlPhaseEnd + +rlJournalEnd +rlJournalPrintText diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..99fd67e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +contact: Mikolaj Izdebski +framework: beakerlib +test: ./runtest.sh +tier: 0 From 8b753ca4f12e971b0543c07b326ee95f8a27ed92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:52:19 +0000 Subject: [PATCH 05/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 5d22da6..5f4d89a 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 30%{?dist} +Release: 31%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: SMLNJ @@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From fa198922595fdead4e23272a27fd4e29afa59b8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 06/25] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 383f9e2555f8688ed3b71423d646d6485a783a7b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 07/25] Switch from %setup to %autosetup --- java_cup-build.patch | 4 ++-- java_cup.spec | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/java_cup-build.patch b/java_cup-build.patch index 4fcfdbd..d1e400b 100644 --- a/java_cup-build.patch +++ b/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/java_cup.spec b/java_cup.spec index 5f4d89a..76be9a8 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -52,9 +52,7 @@ Summary: Documentation for java_cup Documentation for java_cup. %prep -%setup -q -%patch 0 -b .build -%patch 1 -p1 +%autosetup -p1 -C # remove all binary files find -name "*.class" -delete From e208cdc226927eb585ca71c98e132d2b8552b34e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 08/25] Switch to non-numdered patches --- java_cup.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 76be9a8..cb31a15 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -19,8 +19,8 @@ Source0: java_cup-%{version}.tar.bz2 Source2: %{name}-MANIFEST.MF Source4: %{name}-runtime-MANIFEST.MF -Patch0: %{name}-build.patch -Patch1: 0002-Set-Java-source-target-to-1.8.patch +Patch: %{name}-build.patch +Patch: 0002-Set-Java-source-target-to-1.8.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 497639daca1e0c1a097f3100c4f62f32b0192375 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:06 +0200 Subject: [PATCH 09/25] Convert to %autorelease and %autochangelog --- changelog | 240 +++++++++++++++++++++++++++++++++++++++++++++++++ java_cup.spec | 243 +------------------------------------------------- 2 files changed, 242 insertions(+), 241 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..7e4d9d3 --- /dev/null +++ b/changelog @@ -0,0 +1,240 @@ +* 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 + +* Mon Sep 25 2017 Mikolaj Izdebski - 1:0.11b-7 +- Elimitate race condition when injecting JAR manifest +- Resolves: rhbz#1495233 + +* Wed Jul 26 2017 Fedora Release Engineering - 1:0.11b-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 22 2017 Michael Simacek - 1:0.11b-5 +- Install with XMvn + +* Fri Feb 10 2017 Fedora Release Engineering - 1:0.11b-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1:0.11b-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Dec 24 2015 gil cattaneo 1:0.11b-2 +- convert %%defines to %%global + +* Tue Jun 23 2015 Mikolaj Izdebski - 1:0.11b-1 +- Update to upstream version 0.11b + +* Wed Jun 17 2015 Fedora Release Engineering - 1:0.11a-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Feb 06 2015 gil cattaneo 1:0.11a-19 +- introduce license macro + +* Sat Jun 07 2014 Fedora Release Engineering - 1:0.11a-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Mikolaj Izdebski - 1:0.11a-17 +- Use .mfiles generated during build + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1:0.11a-16 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 31 2013 Mat Booth - 1:0.11a-15 +- Inject OSGi manifests into both jars. + +* Fri Aug 30 2013 Mat Booth - 1:0.11a-14 +- Patch so that generated action methods do not exceed the 65535 byte JVM + method size limit. Supplied by eclipse-pdt project. +- Drop rpm bug workaround scriptlet. + +* Sat Aug 03 2013 Fedora Release Engineering - 1:0.11a-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1:0.11a-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 13 2012 gil cattaneo 1:0.11a-11 +- adapt to current guideline +- add %%pre javadoc script + +* Tue Nov 13 2012 Tom Callaway - 1:0.11a-10 +- include copy of LICENSE, correct License tag + +* Thu Jul 19 2012 Fedora Release Engineering - 1:0.11a-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jun 24 2012 Gerard Ryan - 1:0.11a-8 +- Inject OSGI Manifest for java-cup-runtime.jar + +* Fri Jan 13 2012 Fedora Release Engineering - 1:0.11a-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 1:0.11a-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Dec 04 2010 Lubomir Rintel 1:0.11a-5 +- Require appropriate packages for depmap maintenance in scriptlets +- Remove classpath from jar manifest + +* Mon Feb 15 2010 Alexander Kurtakov 1:0.11a-4 +- Add maven pom and depmap. + +* Wed Jan 20 2010 Alexander Kurtakov 1:0.11a-3 +- Fix bootstrap. + +* Sun Jan 17 2010 Miloš Jakubíček - 1:0.11a-2 +- Rebuilt in non-bootstrap mode (removed all prebuilt jars). +- Added BR: jflex and java_cup >= 1:0.11a for non-bootstrap mode +- Remove unnecessary R(post,postun): coreutils + +* Fri Jan 8 2010 Alexander Kurtakov 1:0.11a-1 +- Update to 0.11a. +- Drop gcj_support. + +* Fri Jul 24 2009 Fedora Release Engineering - 1:0.10k-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1:0.10k-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jul 15 2008 Lubomir Rintel - 1:0.10k-1 +- Fix the version to match upstream, so that FEver can be used + +* Wed Jul 9 2008 Tom "spot" Callaway - 1:0.10-0.k.6.3 +- drop repotag + +* Sun Feb 17 2008 Lubomir Kundrak - 1:0.10-0.k.6jpp.2 +- Ant task +- Clean up to satisfy QA script and rpmlint + +* Fri Aug 04 2006 Vivek Lakshmanan - 1:0.10-0.k.6jpp.1 +- Re-sync with latest version from JPP. +- Partially adopt new naming convention. + +* Sat Jul 22 2006 Jakub Jelinek - 1:0.10-0.k.5jpp_2fc +- Rebuilt + +* Thu Jul 20 2006 Vivek Lakshmanan - 1:0.10-0.k.5jpp_1fc +- Re-sync with latest version from JPP. + +* Wed Jul 19 2006 Vivek Lakshmanan - 1:0.10-0.k.4jpp_1fc +- Conditional native compilation for GCJ. + +* Wed Jul 12 2006 Jesse Keating - 1:0.10-0.k.1jpp_10fc +- rebuild + +* Mon Mar 6 2006 Jeremy Katz - 1:0.10-0.k.1jpp_9fc +- stop scriptlet spew + +* Fri Feb 10 2006 Jesse Keating - 1:0.10-0.k.1jpp_8fc +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1:0.10-0.k.1jpp_7fc +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Tue Jan 3 2006 Jesse Keating 1:0.10-0.k.1jpp_6fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Jul 19 2005 Gary Benson 1:0.10-0.k.1jpp_5fc +- Build on ia64, ppc64, s390 and s390x. +- Switch to aot-compile-rpm. + +* Tue Jun 28 2005 Gary Benson 1:0.10-0.k.1jpp_4fc +- BC-compile. + +* Tue Jun 21 2005 Gary Benson 1:0.10-0.k.1jpp_3fc +- Remove classes from the tarball. + +* Thu Nov 4 2004 Gary Benson 1:0.10-0.k.1jpp_2fc +- Build into Fedora. + +* Thu Mar 4 2004 Frank Ch. Eigler 1:0.10-0.k.1jpp_1rh +- RH vacuuming + +* Thu Jan 22 2004 David Walluck 1:0.10-0.k.1jpp +- fix version/release (bump epoch) +- change License tag from Free to BSD-style +- add Distribution tag +- really update for JPackage 1.5 + +* Wed Mar 26 2003 Paul Nasrat 0.10k-1jpp +- for jpackage-utils 1.5 +- New spec reverse engineered from binary rpms diff --git a/java_cup.spec b/java_cup.spec index cb31a15..73a9d27 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 31%{?dist} +Release: %autorelease Epoch: 1 Summary: LALR parser generator for Java License: SMLNJ @@ -98,243 +98,4 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog -* 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 - -* Mon Sep 25 2017 Mikolaj Izdebski - 1:0.11b-7 -- Elimitate race condition when injecting JAR manifest -- Resolves: rhbz#1495233 - -* Wed Jul 26 2017 Fedora Release Engineering - 1:0.11b-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 22 2017 Michael Simacek - 1:0.11b-5 -- Install with XMvn - -* Fri Feb 10 2017 Fedora Release Engineering - 1:0.11b-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1:0.11b-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Dec 24 2015 gil cattaneo 1:0.11b-2 -- convert %%defines to %%global - -* Tue Jun 23 2015 Mikolaj Izdebski - 1:0.11b-1 -- Update to upstream version 0.11b - -* Wed Jun 17 2015 Fedora Release Engineering - 1:0.11a-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 06 2015 gil cattaneo 1:0.11a-19 -- introduce license macro - -* Sat Jun 07 2014 Fedora Release Engineering - 1:0.11a-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Mikolaj Izdebski - 1:0.11a-17 -- Use .mfiles generated during build - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1:0.11a-16 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 31 2013 Mat Booth - 1:0.11a-15 -- Inject OSGi manifests into both jars. - -* Fri Aug 30 2013 Mat Booth - 1:0.11a-14 -- Patch so that generated action methods do not exceed the 65535 byte JVM - method size limit. Supplied by eclipse-pdt project. -- Drop rpm bug workaround scriptlet. - -* Sat Aug 03 2013 Fedora Release Engineering - 1:0.11a-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 1:0.11a-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Nov 13 2012 gil cattaneo 1:0.11a-11 -- adapt to current guideline -- add %%pre javadoc script - -* Tue Nov 13 2012 Tom Callaway - 1:0.11a-10 -- include copy of LICENSE, correct License tag - -* Thu Jul 19 2012 Fedora Release Engineering - 1:0.11a-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jun 24 2012 Gerard Ryan - 1:0.11a-8 -- Inject OSGI Manifest for java-cup-runtime.jar - -* Fri Jan 13 2012 Fedora Release Engineering - 1:0.11a-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 1:0.11a-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Dec 04 2010 Lubomir Rintel 1:0.11a-5 -- Require appropriate packages for depmap maintenance in scriptlets -- Remove classpath from jar manifest - -* Mon Feb 15 2010 Alexander Kurtakov 1:0.11a-4 -- Add maven pom and depmap. - -* Wed Jan 20 2010 Alexander Kurtakov 1:0.11a-3 -- Fix bootstrap. - -* Sun Jan 17 2010 Miloš Jakubíček - 1:0.11a-2 -- Rebuilt in non-bootstrap mode (removed all prebuilt jars). -- Added BR: jflex and java_cup >= 1:0.11a for non-bootstrap mode -- Remove unnecessary R(post,postun): coreutils - -* Fri Jan 8 2010 Alexander Kurtakov 1:0.11a-1 -- Update to 0.11a. -- Drop gcj_support. - -* Fri Jul 24 2009 Fedora Release Engineering - 1:0.10k-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1:0.10k-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jul 15 2008 Lubomir Rintel - 1:0.10k-1 -- Fix the version to match upstream, so that FEver can be used - -* Wed Jul 9 2008 Tom "spot" Callaway - 1:0.10-0.k.6.3 -- drop repotag - -* Sun Feb 17 2008 Lubomir Kundrak - 1:0.10-0.k.6jpp.2 -- Ant task -- Clean up to satisfy QA script and rpmlint - -* Fri Aug 04 2006 Vivek Lakshmanan - 1:0.10-0.k.6jpp.1 -- Re-sync with latest version from JPP. -- Partially adopt new naming convention. - -* Sat Jul 22 2006 Jakub Jelinek - 1:0.10-0.k.5jpp_2fc -- Rebuilt - -* Thu Jul 20 2006 Vivek Lakshmanan - 1:0.10-0.k.5jpp_1fc -- Re-sync with latest version from JPP. - -* Wed Jul 19 2006 Vivek Lakshmanan - 1:0.10-0.k.4jpp_1fc -- Conditional native compilation for GCJ. - -* Wed Jul 12 2006 Jesse Keating - 1:0.10-0.k.1jpp_10fc -- rebuild - -* Mon Mar 6 2006 Jeremy Katz - 1:0.10-0.k.1jpp_9fc -- stop scriptlet spew - -* Fri Feb 10 2006 Jesse Keating - 1:0.10-0.k.1jpp_8fc -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1:0.10-0.k.1jpp_7fc -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 3 2006 Jesse Keating 1:0.10-0.k.1jpp_6fc -- rebuilt again - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Tue Jul 19 2005 Gary Benson 1:0.10-0.k.1jpp_5fc -- Build on ia64, ppc64, s390 and s390x. -- Switch to aot-compile-rpm. - -* Tue Jun 28 2005 Gary Benson 1:0.10-0.k.1jpp_4fc -- BC-compile. - -* Tue Jun 21 2005 Gary Benson 1:0.10-0.k.1jpp_3fc -- Remove classes from the tarball. - -* Thu Nov 4 2004 Gary Benson 1:0.10-0.k.1jpp_2fc -- Build into Fedora. - -* Thu Mar 4 2004 Frank Ch. Eigler 1:0.10-0.k.1jpp_1rh -- RH vacuuming - -* Thu Jan 22 2004 David Walluck 1:0.10-0.k.1jpp -- fix version/release (bump epoch) -- change License tag from Free to BSD-style -- add Distribution tag -- really update for JPackage 1.5 - -* Wed Mar 26 2003 Paul Nasrat 0.10k-1jpp -- for jpackage-utils 1.5 -- New spec reverse engineered from binary rpms +%autochangelog From 0614d75df041dcf7e096a69f5baab71ecd9e7521 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Nov 2024 07:53:07 +0100 Subject: [PATCH 10/25] Drop explicit requires on javapackages-tools --- java_cup.spec | 5 ----- plans/javapackages.fmf | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 73a9d27..a195c70 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -31,11 +31,6 @@ BuildRequires: jflex BuildRequires: java_cup %endif -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - - %description java_cup is a LALR Parser Generator for Java diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From d6cee538ceac32a16357c1a7196ff8794bb869d7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 11/25] Unify spec style with the rest of Java/Maven packages [skip changelog] --- java_cup.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index a195c70..27db95c 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,6 +1,5 @@ %bcond_with bootstrap - -%global pkg_version 11b +%global pkg_version 11b Name: java_cup Version: 0.11b @@ -35,7 +34,7 @@ BuildRequires: java_cup java_cup is a LALR Parser Generator for Java %package javadoc -Summary: Javadoc for java_cup +Summary: Javadoc for java_cup %description javadoc Javadoc for java_cup @@ -85,12 +84,12 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %doc changelog.txt %license licence.txt +%files javadoc -f .mfiles-javadoc +%license licence.txt + %files manual %doc manual.html %license licence.txt -%files javadoc -f .mfiles-javadoc -%license licence.txt - %changelog %autochangelog From 44d41ccb6b7c86affdd8b017a5cfdf28ba197e31 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:40:57 +0100 Subject: [PATCH 12/25] Reorder spec file tags [skip changelog] --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 27db95c..d083fbe 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -2,9 +2,9 @@ %global pkg_version 11b Name: java_cup +Epoch: 1 Version: 0.11b Release: %autorelease -Epoch: 1 Summary: LALR parser generator for Java License: SMLNJ URL: http://www2.cs.tum.edu/projects/cup/ From 93c4e695c3ead0c41ce9e9bbece1a1b4eae8394b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 17:01:09 +0100 Subject: [PATCH 13/25] Sort dependencies [skip changelog] --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index d083fbe..801133e 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -26,8 +26,8 @@ BuildRequires: javapackages-bootstrap %else BuildRequires: javapackages-local BuildRequires: ant -BuildRequires: jflex BuildRequires: java_cup +BuildRequires: jflex %endif %description From 80a89be662a00af299bc4f4e8f83d06a8d35e7b2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 14/25] Update javadoc package description [skip changelog] --- java_cup.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 801133e..e89848f 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,10 +34,10 @@ BuildRequires: jflex 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 From e48778d9754968318be7b84d0722f8fe236d8bec Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Jan 2025 10:46:45 +0100 Subject: [PATCH 15/25] Switch upstream URL to https --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index e89848f..486d835 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -7,7 +7,7 @@ Version: 0.11b Release: %autorelease Summary: LALR parser generator for Java License: SMLNJ -URL: http://www2.cs.tum.edu/projects/cup/ +URL: https://www2.cs.tum.edu/projects/cup/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch From ff73c93ca36e75d79b47dfe213108285ce911dd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:42:34 +0000 Subject: [PATCH 16/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From fa00fa6567ae80f8e822732c06b9b51b09c97945 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 18 Feb 2025 14:56:00 +0100 Subject: [PATCH 17/25] Use %jar macro The %jar macro invokes jar from %java_home, while plain jar invocations relies on PATH. --- java_cup.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 486d835..e950bc6 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -67,8 +67,8 @@ find -name parser.cup -delete %ant javadoc # inject OSGi manifests -jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2} -jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} +%jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2} +%jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %install %mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar From 51115c2c15048e401cc342caef27f881bec0bbac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 18/25] Remove javadoc subpackage --- java_cup.spec | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index e950bc6..e230e2a 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -29,16 +29,12 @@ BuildRequires: ant BuildRequires: java_cup BuildRequires: jflex %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 0.11b-57 %description java_cup is a LALR Parser Generator for Java -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %package manual Summary: Documentation for java_cup @@ -63,8 +59,6 @@ rm -rf java_cup-%{version}/bin/java-cup-11.jar export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) %ant -Dcupversion=20150326 -Dsvnversion=65 -find -name parser.cup -delete -%ant javadoc # inject OSGi manifests %jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2} @@ -74,7 +68,7 @@ find -name parser.cup -delete %mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar %mvn_artifact %{name}:%{name}-runtime:%{version} dist/java-cup-%{pkg_version}-runtime.jar -%mvn_install -J dist/javadoc +%mvn_install # wrapper script for direct execution %jpackage_script java_cup.Main "" "" java_cup cup true @@ -84,9 +78,6 @@ find -name parser.cup -delete %doc changelog.txt %license licence.txt -%files javadoc -f .mfiles-javadoc -%license licence.txt - %files manual %doc manual.html %license licence.txt From d39e1631d52b854c316696d71f3a7ed637b72f69 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 5 Mar 2025 13:49:07 +0100 Subject: [PATCH 19/25] Fix javadoc obsoletes version --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index e230e2a..9b62e9f 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -30,7 +30,7 @@ BuildRequires: java_cup BuildRequires: jflex %endif # TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 0.11b-57 +Obsoletes: %{name}-javadoc < 1:0.11b-57 %description java_cup is a LALR Parser Generator for Java From d80ad2775e9254ce75a86158bb56fc6906cbf191 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 20/25] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From bbc0fe69933fbf0204bcf03a21108b9a881685b7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 21/25] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From c25ac18ac358513228e3389581735607f89fe921 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 22/25] Build with OpenJDK 25 --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 9b62e9f..ef8667e 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -24,7 +24,7 @@ Patch: 0002-Set-Java-source-target-to-1.8.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: ant BuildRequires: java_cup BuildRequires: jflex From 7d0540a11c384d4621c41eed8d971f99cfa8f3c8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 16 Jul 2025 18:06:30 +0200 Subject: [PATCH 23/25] Regenerate tarball from git repo --- .gitignore | 1 + ...ild.patch => 0001-Adopt-build-script.patch | 41 ++++++++++++------- 0002-Set-Java-source-target-to-1.8.patch | 25 ----------- java_cup.spec | 9 ++-- sources | 2 +- 5 files changed, 33 insertions(+), 45 deletions(-) rename java_cup-build.patch => 0001-Adopt-build-script.patch (51%) delete mode 100644 0002-Set-Java-source-target-to-1.8.patch diff --git a/.gitignore b/.gitignore index daa0ee8..bfd0d32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ java_cup_v10k.tar.gz java_cup-0.11a.tar.bz2 /java_cup-0.11b.tar.bz2 +/java_cup-0.11b.tar.zst diff --git a/java_cup-build.patch b/0001-Adopt-build-script.patch similarity index 51% rename from java_cup-build.patch rename to 0001-Adopt-build-script.patch index d1e400b..4d476d5 100644 --- a/java_cup-build.patch +++ b/0001-Adopt-build-script.patch @@ -1,5 +1,16 @@ ---- java_cup/build.xml~ 2014-06-12 17:23:24.000000000 +0200 -+++ java_cup/build.xml 2015-06-23 10:30:57.374976304 +0200 +From d58d0d2cb2626b15077eaf902f16f7a6bca41933 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 16 Jul 2025 18:15:17 +0200 +Subject: [PATCH] Adopt build script + +--- + build.xml | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/build.xml b/build.xml +index 33f0c60..975e753 100644 +--- a/build.xml ++++ b/build.xml @@ -17,18 +17,6 @@ @@ -19,7 +30,17 @@ -@@ -78,7 +66,6 @@ +@@ -69,8 +57,7 @@ + token="+ version_str" + value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'> + +- +- ++ + + + +@@ -78,7 +65,6 @@ @@ -27,14 +48,6 @@ -@@ -143,4 +130,10 @@ - - - -+ -+ -+ -+ -+ -+ - +-- +2.50.1 + diff --git a/0002-Set-Java-source-target-to-1.8.patch b/0002-Set-Java-source-target-to-1.8.patch deleted file mode 100644 index b62e62e..0000000 --- a/0002-Set-Java-source-target-to-1.8.patch +++ /dev/null @@ -1,25 +0,0 @@ -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/java_cup.spec b/java_cup.spec index ef8667e..81a8a42 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -11,15 +11,14 @@ URL: https://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/ -Source0: java_cup-%{version}.tar.bz2 +# git clone https://github.com/DrMichaelPetter/cup.git +# git -C cup archive --prefix java_cup-0.11b/ c35ed3ab0cde2310af9b01321c930349c7c797e2 | zstd -15 >java_cup-0.11b.tar.zst +Source0: java_cup-%{version}.tar.zst # Add OSGi manifests Source2: %{name}-MANIFEST.MF Source4: %{name}-runtime-MANIFEST.MF -Patch: %{name}-build.patch -Patch: 0002-Set-Java-source-target-to-1.8.patch +Patch: 0001-Adopt-build-script.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap diff --git a/sources b/sources index 9a29652..3bdd25b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (java_cup-0.11b.tar.bz2) = b5528d1e7ca193331a5c431b86d273d840bee08d7a02453ac1c9a2c9890b2f2ab889dd63b3ae123d1185ea55601e2b045f8d743170dab0648eac50f9861ab8c8 +SHA512 (java_cup-0.11b.tar.zst) = f999ed5c20c35eb2f86aa5b1720f9f38b2c0729edddfbbabe81779d7221b6d3253b92e1b86d4055d2b9da61b644d2196c3d41b025de455ca67c5448d3f02d233 From 0d8fd11097740d035a4e247b9ed67c03f3dcdf80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:56:10 +0000 Subject: [PATCH 24/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From bd588346c1561b5783d40f688ff760699e34c45a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 21:17:46 +0200 Subject: [PATCH 25/25] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 81a8a42..9e974d1 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -24,7 +24,7 @@ Patch: 0001-Adopt-build-script.patch BuildRequires: javapackages-bootstrap %else BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: java_cup BuildRequires: jflex %endif