From fa00fa6567ae80f8e822732c06b9b51b09c97945 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 18 Feb 2025 14:56:00 +0100 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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