From 3e299ea30cc47cd1ac941d58d977a87282ce8e2c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 20:29:59 -0600 Subject: [PATCH 01/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 5d73d48..d02618a 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 Summary: Java source interpreter Group: Development/Tools @@ -149,6 +149,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadocdir}/%{name} %changelog +* 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 From 581e653394be87d57cefe17dc5d8b38ab2da0f2c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 15:29:48 -0500 Subject: [PATCH 02/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index d02618a..a21814e 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 Summary: Java source interpreter Group: Development/Tools @@ -149,6 +149,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : %{_javadocdir}/%{name} %changelog +* 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 From 63f05d82777a1e494091aecf7fe8776193b15ee3 Mon Sep 17 00:00:00 2001 From: gil Date: Sun, 4 Aug 2013 02:33:24 +0200 Subject: [PATCH 03/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild, minor changes to adapt to new guideline --- java_cup.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index a21814e..46892bf 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -37,16 +37,15 @@ Version: 0.11a Release: 13%{?dist} Epoch: 1 Summary: Java source interpreter -Group: Development/Tools License: MIT URL: http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/ #svn export -r 21 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11a #tar cjf java_cup-0.11a.tar.bz2 java_cup-0.11a/ Source0: java_cup-0.11a.tar.bz2 Source1: java_cup-pom.xml -Source2: %{name}-runtime-MANIFEST.MF +Source2: %{name}-runtime-MANIFEST.MF # Taken from http://www2.cs.tum.edu/projects/cup/ -Source3: LICENSE.txt +Source3: LICENSE.txt Patch0: %{name}-build.patch Patch1: java_cup-0.11a-manifest.patch @@ -69,15 +68,12 @@ java_cup is a LALR Parser Generator for Java %package javadoc Summary: Javadoc for java_cup -Group: Documentation -Requires: jpackage-utils %description javadoc Javadoc for java_cup %package manual Summary: Documentation for java_cup -Group: Documentation %description manual Documentation for java_cup. @@ -124,7 +120,7 @@ install -m 644 dist/java-cup-%{pkg_version}-runtime.jar %{buildroot}%{_javadir}/ # poms install -d -m 755 %{buildroot}%{_mavenpomdir} install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap java_cup java_cup %{version} JPP java_cup +%add_maven_depmap # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} From 54bcb6ffb170c99b8ce89930775a283ab3505278 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 30 Aug 2013 13:40:15 +0100 Subject: [PATCH 04/80] 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. --- java_cup.spec | 20 ++++--- javacup10k_split_do_action_method.diff | 74 ++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 javacup10k_split_do_action_method.diff diff --git a/java_cup.spec b/java_cup.spec index 46892bf..d0732d3 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 Summary: Java source interpreter License: MIT @@ -49,6 +49,10 @@ Source3: LICENSE.txt Patch0: %{name}-build.patch Patch1: java_cup-0.11a-manifest.patch +# Patch from eclipe-pdt to get around generated actions methods exceeding the 65535 bytes limit: +# http://git.eclipse.org/c/pdt/org.eclipse.pdt.git/tree/plugins/org.eclipse.php.core.parser/javacup10k_split_do_action_method.diff +Patch2: javacup10k_split_do_action_method.diff + BuildRequires: ant BuildRequires: java-devel BuildRequires: jpackage-utils >= 0:1.5 @@ -59,7 +63,6 @@ BuildRequires: java_cup >= 1:0.11a BuildRequires: zip Requires: java -Requires: jpackage-utils BuildArch: noarch @@ -82,6 +85,9 @@ Documentation for java_cup. %setup -q %patch0 -b .build %patch1 -p1 -b .manifest +pushd src +%patch2 -p1 -b .orig +popd cp %{SOURCE1} pom.xml cp %{SOURCE3} . @@ -135,16 +141,16 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %files manual %doc manual.html LICENSE.txt -%pre javadoc -# workaround for rpm bug, can be removed in F-17 -[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ -rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || : - %files javadoc %doc LICENSE.txt %{_javadocdir}/%{name} %changelog +* 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 diff --git a/javacup10k_split_do_action_method.diff b/javacup10k_split_do_action_method.diff new file mode 100644 index 0000000..971c00e --- /dev/null +++ b/javacup10k_split_do_action_method.diff @@ -0,0 +1,74 @@ +# This patch splits the main do_action() method in order to solve the JVM memory limitation problem +# +--- java_cup_v10k.old/java_cup/emit.java 1999-07-24 15:51:33.000000000 +0300 ++++ java_cup_v10k/java_cup/emit.java 2009-01-21 11:12:13.000000000 +0200 +@@ -340,7 +340,7 @@ + out.println(" this.parser = parser;"); + out.println(" }"); + +- /* action method head */ ++ /* main action method head */ + out.println(); + out.println(" /** Method with the actual generated action code. */"); + out.println(" public final java_cup.runtime.Symbol " + +@@ -352,6 +352,38 @@ + out.println(" throws java.lang.Exception"); + out.println(" {"); + ++ /* split action code into several methods because of the JVM limitation of method size to 64KB */ ++ final int splitBase = 100; ++ for (int splitIdx = 0; splitIdx < production.number(); splitIdx += splitBase) { ++ if (splitIdx > 0) { ++ out.print(" else "); ++ } ++ if (splitIdx + splitBase < production.number()) { ++ out.println(" if (" + pre("act_num") + " < " + (splitIdx + splitBase) + ") {"); ++ } else { ++ out.println(" {"); ++ } ++ out.println(" return " + pre("do_action") + ((splitIdx + splitBase) / splitBase) + "("); ++ out.println(" " + pre("act_num, ") + pre("parser,") + pre("stack,") + pre("top") + ");"); ++ out.println(" }"); ++ } ++ out.println(" }"); ++ out.println(); ++ ++ for (int splitIdx = 0; splitIdx < production.number(); splitIdx += splitBase) { ++ ++ /* splitted action method head */ ++ out.println(); ++ out.println(" /** Method with the actual generated action code. */"); ++ out.println(" public final java_cup.runtime.Symbol " + ++ pre("do_action") + ((splitIdx + splitBase)/splitBase) + "("); ++ out.println(" int " + pre("act_num,")); ++ out.println(" java_cup.runtime.lr_parser " + pre("parser,")); ++ out.println(" java.util.Stack " + pre("stack,")); ++ out.println(" int " + pre("top)")); ++ out.println(" throws java.lang.Exception"); ++ out.println(" {"); ++ + /* declaration of result symbol */ + /* New declaration!! now return Symbol + 6/13/96 frankf */ +@@ -365,9 +397,9 @@ + out.println(" {"); + + /* emit action code for each production as a separate case */ +- for (Enumeration p = production.all(); p.hasMoreElements(); ) +- { +- prod = (production)p.nextElement(); ++ ++ for (int prodIdx = splitIdx; prodIdx < production.number() && prodIdx < splitIdx + splitBase; ++prodIdx) { ++ prod = (production)production.find(prodIdx); + + /* case label */ + out.println(" /*. . . . . . . . . . . . . . . . . . . .*/"); +@@ -471,6 +503,8 @@ + /* end of method */ + out.println(" }"); + ++ } ++ + /* end of class */ + out.println("}"); + out.println(); From 4fcc98e1394911f510d501480cba1c940a54ddc4 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sat, 31 Aug 2013 16:53:50 +0100 Subject: [PATCH 05/80] Inject OSGi manifests into both jars. --- java_cup-MANIFEST.MF | 10 ++++++++++ java_cup-runtime-MANIFEST.MF | 2 +- java_cup.spec | 14 +++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 java_cup-MANIFEST.MF diff --git a/java_cup-MANIFEST.MF b/java_cup-MANIFEST.MF new file mode 100644 index 0000000..4b3ffba --- /dev/null +++ b/java_cup-MANIFEST.MF @@ -0,0 +1,10 @@ +Manifest-Version: 1.0 +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-Name: Java Cup +Bundle-SymbolicName: java_cup +Export-Package: java_cup,java_cup.runtime +Bundle-Version: 0.11.0 +Bundle-ManifestVersion: 2 +Main-Class: java_cup/Main diff --git a/java_cup-runtime-MANIFEST.MF b/java_cup-runtime-MANIFEST.MF index 6d79887..a644cbf 100644 --- a/java_cup-runtime-MANIFEST.MF +++ b/java_cup-runtime-MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 -Bundle-Name: %pluginName +Bundle-Name: Java Cup Runtime Bundle-SymbolicName: java_cup.runtime Export-Package: java_cup.runtime Bundle-Version: 0.11.0 diff --git a/java_cup.spec b/java_cup.spec index d0732d3..2b5af6f 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 Summary: Java source interpreter License: MIT @@ -43,7 +43,9 @@ URL: http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/ #tar cjf java_cup-0.11a.tar.bz2 java_cup-0.11a/ Source0: java_cup-0.11a.tar.bz2 Source1: java_cup-pom.xml -Source2: %{name}-runtime-MANIFEST.MF +# Add OSGi manifests +Source2: %{name}-MANIFEST.MF +Source4: %{name}-runtime-MANIFEST.MF # Taken from http://www2.cs.tum.edu/projects/cup/ Source3: LICENSE.txt Patch0: %{name}-build.patch @@ -112,10 +114,13 @@ find -name parser.cup -delete ant javadoc %install -# inject OSGi manifest +# inject OSGi manifests mkdir -p META-INF cp -p %{SOURCE2} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF +zip -u dist/java-cup-%{pkg_version}.jar META-INF/MANIFEST.MF +cp -p %{SOURCE4} META-INF/MANIFEST.MF +touch META-INF/MANIFEST.MF zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF # jar @@ -146,6 +151,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* 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. From 999da954742c33559e3a8c4585ffac2af597cbd1 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 4 Mar 2014 09:05:29 +0100 Subject: [PATCH 06/80] Use Requires: java-headless rebuild (#1067528) --- java_cup.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 2b5af6f..9bf030d 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 Summary: Java source interpreter License: MIT @@ -64,7 +64,7 @@ BuildRequires: java_cup >= 1:0.11a %endif BuildRequires: zip -Requires: java +Requires: java-headless BuildArch: noarch @@ -151,6 +151,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* 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. From b99ff6f001f3d80bcb09262d2e860e2742d1b62c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 May 2014 11:14:26 +0200 Subject: [PATCH 07/80] Use .mfiles generated during build --- java_cup.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 9bf030d..746d756 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 Summary: Java source interpreter License: MIT @@ -137,11 +137,9 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} -%files +%files -f .mfiles %doc changelog.txt LICENSE.txt %{_javadir}/* -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* %files manual %doc manual.html LICENSE.txt @@ -151,6 +149,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* 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) From c35e644dd34a6ccac9b6dff924704946a0171a5c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 18:28:07 -0500 Subject: [PATCH 08/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 746d756..0ee553a 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 Summary: Java source interpreter License: MIT @@ -149,6 +149,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* 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 From 7b929abdd7039c6b8bcb9caf30e3dbfcd1e17aa0 Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 6 Feb 2015 16:21:56 +0100 Subject: [PATCH 09/80] introduce license macro --- java_cup.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 0ee553a..12cba8e 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 Summary: Java source interpreter License: MIT @@ -138,17 +138,22 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles -%doc changelog.txt LICENSE.txt +%doc changelog.txt %{_javadir}/* +%license LICENSE.txt %files manual -%doc manual.html LICENSE.txt +%doc manual.html +%license LICENSE.txt %files javadoc -%doc LICENSE.txt +%license LICENSE.txt %{_javadocdir}/%{name} %changelog +* 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 From e9637cb1f7700fe3252bee9d335b65da42029e05 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 11:52:45 +0000 Subject: [PATCH 10/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 12cba8e..7114c96 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -34,7 +34,7 @@ Name: java_cup Version: 0.11a -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 Summary: Java source interpreter License: MIT @@ -151,6 +151,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* 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 From bef0cfce411dcb85d69cbdc32a1bad079b7ce364 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 23 Jun 2015 09:44:01 +0200 Subject: [PATCH 11/80] Update to upstream version 0.11b --- .gitignore | 1 + LICENSE.txt | 19 ------ java_cup-0.11a-manifest.patch | 24 ------- java_cup-build.patch | 58 ++++++++++------ java_cup-pom.xml | 2 +- java_cup.spec | 92 ++++++++------------------ javacup10k_split_do_action_method.diff | 74 --------------------- sources | 2 +- 8 files changed, 68 insertions(+), 204 deletions(-) delete mode 100644 LICENSE.txt delete mode 100644 java_cup-0.11a-manifest.patch delete mode 100644 javacup10k_split_do_action_method.diff diff --git a/.gitignore b/.gitignore index c79c486..daa0ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ java_cup_v10k.tar.gz java_cup-0.11a.tar.bz2 +/java_cup-0.11b.tar.bz2 diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index ba43a7d..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,19 +0,0 @@ -CUP Parser Generator Copyright Notice, License, and Disclaimer -Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both the copyright notice and this permission notice and warranty -disclaimer appear in supporting documentation, and that the names of the -authors or their employers not be used in advertising or publicity -pertaining to distribution of the software without specific, written -prior permission. - -The authors and their employers disclaim all warranties with regard to -this software, including all implied warranties of merchantability and -fitness. In no event shall the authors or their employers be liable for -any special, indirect or consequential damages or any damages whatsoever -resulting from loss of use, data or profits, whether in an action of -contract, negligence or other tortious action, arising out of or in -connection with the use or performance of this software. diff --git a/java_cup-0.11a-manifest.patch b/java_cup-0.11a-manifest.patch deleted file mode 100644 index bf0dbcd..0000000 --- a/java_cup-0.11a-manifest.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 447c8beb89190adc2c51c533e93ad26f8eaf34d9 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Sat, 4 Dec 2010 10:27:15 -0500 -Subject: [PATCH] Remove class path from jar manifest - ---- - build.xml | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/build.xml b/build.xml -index 06170de..06e2a7d 100644 ---- a/build.xml -+++ b/build.xml -@@ -62,7 +62,6 @@ - - - -- - - - --- -1.7.3.1 - diff --git a/java_cup-build.patch b/java_cup-build.patch index bd1435d..4fcfdbd 100644 --- a/java_cup-build.patch +++ b/java_cup-build.patch @@ -1,22 +1,40 @@ ---- build.xml.sav 2006-03-28 14:34:52.000000000 +0300 -+++ build.xml 2010-01-08 12:50:20.346608627 +0200 -@@ -76,4 +76,19 @@ - - +--- build.xml~ 2014-06-12 17:23:24.000000000 +0200 ++++ build.xml 2015-06-23 10:30:57.374976304 +0200 +@@ -17,18 +17,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ + + +@@ -78,7 +66,6 @@ + + + +- + + + +@@ -143,4 +130,10 @@ + + + ++ ++ ++ ++ ++ ++ diff --git a/java_cup-pom.xml b/java_cup-pom.xml index 66b1d9a..c196b8f 100644 --- a/java_cup-pom.xml +++ b/java_cup-pom.xml @@ -6,5 +6,5 @@ java_cup jar Java CUP - 0.11a + 0.11b diff --git a/java_cup.spec b/java_cup.spec index 7114c96..ba3f71f 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,71 +1,35 @@ -# Copyright (c) 2000-2005, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -%define pkg_version 11a -%define section free +%define pkg_version 11b %define with_bootstrap 0 Name: java_cup -Version: 0.11a -Release: 20%{?dist} +Version: 0.11b +Release: 1%{?dist} Epoch: 1 -Summary: Java source interpreter +Summary: LALR parser generator for Java License: MIT -URL: http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/ -#svn export -r 21 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11a -#tar cjf java_cup-0.11a.tar.bz2 java_cup-0.11a/ -Source0: java_cup-0.11a.tar.bz2 +URL: http://www2.cs.tum.edu/projects/cup/ +BuildArch: 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 Source1: java_cup-pom.xml # Add OSGi manifests Source2: %{name}-MANIFEST.MF Source4: %{name}-runtime-MANIFEST.MF -# Taken from http://www2.cs.tum.edu/projects/cup/ -Source3: LICENSE.txt + Patch0: %{name}-build.patch -Patch1: java_cup-0.11a-manifest.patch -# Patch from eclipe-pdt to get around generated actions methods exceeding the 65535 bytes limit: -# http://git.eclipse.org/c/pdt/org.eclipse.pdt.git/tree/plugins/org.eclipse.php.core.parser/javacup10k_split_do_action_method.diff -Patch2: javacup10k_split_do_action_method.diff - -BuildRequires: ant -BuildRequires: java-devel -BuildRequires: jpackage-utils >= 0:1.5 -BuildRequires: jflex +BuildRequires: ant +BuildRequires: java-devel +BuildRequires: jpackage-utils >= 0:1.5 +BuildRequires: jflex %if ! %{with_bootstrap} -BuildRequires: java_cup >= 1:0.11a +BuildRequires: java_cup >= 1:0.11a %endif -BuildRequires: zip +BuildRequires: zip -Requires: java-headless -BuildArch: noarch +Requires: java-headless %description @@ -86,22 +50,17 @@ Documentation for java_cup. %prep %setup -q %patch0 -b .build -%patch1 -p1 -b .manifest -pushd src -%patch2 -p1 -b .orig -popd cp %{SOURCE1} pom.xml -cp %{SOURCE3} . # remove all binary files find -name "*.class" -delete %if ! %{with_bootstrap} # remove prebuilt JFlex -rm -rf java_cup-0.11a/bin/JFlex.jar +rm -rf java_cup-%{version}/bin/JFlex.jar # remove prebuilt java_cup, if not bootstrapping -rm -rf java_cup-0.11a/bin/java-cup-11.jar +rm -rf java_cup-%{version}/bin/java-cup-11.jar %endif %build @@ -109,7 +68,7 @@ rm -rf java_cup-0.11a/bin/java-cup-11.jar export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) %endif -ant +ant -Dcupversion=20150326 -Dsvnversion=65 find -name parser.cup -delete ant javadoc @@ -140,17 +99,20 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles %doc changelog.txt %{_javadir}/* -%license LICENSE.txt +%license licence.txt %files manual %doc manual.html -%license LICENSE.txt +%license licence.txt %files javadoc -%license LICENSE.txt +%license licence.txt %{_javadocdir}/%{name} %changelog +* 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 diff --git a/javacup10k_split_do_action_method.diff b/javacup10k_split_do_action_method.diff deleted file mode 100644 index 971c00e..0000000 --- a/javacup10k_split_do_action_method.diff +++ /dev/null @@ -1,74 +0,0 @@ -# This patch splits the main do_action() method in order to solve the JVM memory limitation problem -# ---- java_cup_v10k.old/java_cup/emit.java 1999-07-24 15:51:33.000000000 +0300 -+++ java_cup_v10k/java_cup/emit.java 2009-01-21 11:12:13.000000000 +0200 -@@ -340,7 +340,7 @@ - out.println(" this.parser = parser;"); - out.println(" }"); - -- /* action method head */ -+ /* main action method head */ - out.println(); - out.println(" /** Method with the actual generated action code. */"); - out.println(" public final java_cup.runtime.Symbol " + -@@ -352,6 +352,38 @@ - out.println(" throws java.lang.Exception"); - out.println(" {"); - -+ /* split action code into several methods because of the JVM limitation of method size to 64KB */ -+ final int splitBase = 100; -+ for (int splitIdx = 0; splitIdx < production.number(); splitIdx += splitBase) { -+ if (splitIdx > 0) { -+ out.print(" else "); -+ } -+ if (splitIdx + splitBase < production.number()) { -+ out.println(" if (" + pre("act_num") + " < " + (splitIdx + splitBase) + ") {"); -+ } else { -+ out.println(" {"); -+ } -+ out.println(" return " + pre("do_action") + ((splitIdx + splitBase) / splitBase) + "("); -+ out.println(" " + pre("act_num, ") + pre("parser,") + pre("stack,") + pre("top") + ");"); -+ out.println(" }"); -+ } -+ out.println(" }"); -+ out.println(); -+ -+ for (int splitIdx = 0; splitIdx < production.number(); splitIdx += splitBase) { -+ -+ /* splitted action method head */ -+ out.println(); -+ out.println(" /** Method with the actual generated action code. */"); -+ out.println(" public final java_cup.runtime.Symbol " + -+ pre("do_action") + ((splitIdx + splitBase)/splitBase) + "("); -+ out.println(" int " + pre("act_num,")); -+ out.println(" java_cup.runtime.lr_parser " + pre("parser,")); -+ out.println(" java.util.Stack " + pre("stack,")); -+ out.println(" int " + pre("top)")); -+ out.println(" throws java.lang.Exception"); -+ out.println(" {"); -+ - /* declaration of result symbol */ - /* New declaration!! now return Symbol - 6/13/96 frankf */ -@@ -365,9 +397,9 @@ - out.println(" {"); - - /* emit action code for each production as a separate case */ -- for (Enumeration p = production.all(); p.hasMoreElements(); ) -- { -- prod = (production)p.nextElement(); -+ -+ for (int prodIdx = splitIdx; prodIdx < production.number() && prodIdx < splitIdx + splitBase; ++prodIdx) { -+ prod = (production)production.find(prodIdx); - - /* case label */ - out.println(" /*. . . . . . . . . . . . . . . . . . . .*/"); -@@ -471,6 +503,8 @@ - /* end of method */ - out.println(" }"); - -+ } -+ - /* end of class */ - out.println("}"); - out.println(); diff --git a/sources b/sources index d1fa271..e882a35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -686765898d356a6d3e780d83b3236f39 java_cup-0.11a.tar.bz2 +738656753ed84fb25c9cbe29ab9f05fc java_cup-0.11b.tar.bz2 From f0ee3ac07061a8d099b8dc096eef2ed81a2fa490 Mon Sep 17 00:00:00 2001 From: gil Date: Thu, 24 Dec 2015 23:33:14 +0100 Subject: [PATCH 12/80] convert %%defines to %%global --- java_cup.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index ba3f71f..6d93212 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,9 +1,9 @@ -%define pkg_version 11b -%define with_bootstrap 0 +%global pkg_version 11b +%global with_bootstrap 0 Name: java_cup Version: 0.11b -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -110,6 +110,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* 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 From 0806e53b3e23b7423e258a933de5450f26fd59ea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 00:53:41 +0000 Subject: [PATCH 13/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 6d93212..d74ec18 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -110,6 +110,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* 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 From 4dc3a5dd0172fa4c4ab5766cfd0e98c7ad193d61 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 16:49:27 +0000 Subject: [PATCH 14/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index d74ec18..c248dee 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -110,6 +110,9 @@ cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* 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 From 455deca1012ee0741e6d5caa3ebf31cc2a767184 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 22 Mar 2017 12:47:29 +0100 Subject: [PATCH 15/80] Install with XMvn --- java_cup-pom.xml | 10 ---------- java_cup.spec | 34 +++++++++++----------------------- 2 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 java_cup-pom.xml diff --git a/java_cup-pom.xml b/java_cup-pom.xml deleted file mode 100644 index c196b8f..0000000 --- a/java_cup-pom.xml +++ /dev/null @@ -1,10 +0,0 @@ - - 4.0.0 - java_cup - java_cup - jar - Java CUP - 0.11b - diff --git a/java_cup.spec b/java_cup.spec index c248dee..e6f60f3 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -13,7 +13,6 @@ BuildArch: 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 -Source1: java_cup-pom.xml # Add OSGi manifests Source2: %{name}-MANIFEST.MF Source4: %{name}-runtime-MANIFEST.MF @@ -21,16 +20,13 @@ Source4: %{name}-runtime-MANIFEST.MF Patch0: %{name}-build.patch BuildRequires: ant -BuildRequires: java-devel -BuildRequires: jpackage-utils >= 0:1.5 +BuildRequires: javapackages-local BuildRequires: jflex %if ! %{with_bootstrap} BuildRequires: java_cup >= 1:0.11a %endif BuildRequires: zip -Requires: java-headless - %description java_cup is a LALR Parser Generator for Java @@ -48,9 +44,8 @@ Summary: Documentation for java_cup Documentation for java_cup. %prep -%setup -q +%setup -q %patch0 -b .build -cp %{SOURCE1} pom.xml # remove all binary files find -name "*.class" -delete @@ -82,34 +77,27 @@ cp -p %{SOURCE4} META-INF/MANIFEST.MF touch META-INF/MANIFEST.MF zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF -# jar -install -d -m 755 %{buildroot}%{_javadir} -install -m 644 dist/java-cup-%{pkg_version}.jar %{buildroot}%{_javadir}/%{name}.jar -install -m 644 dist/java-cup-%{pkg_version}-runtime.jar %{buildroot}%{_javadir}/%{name}-runtime.jar +%mvn_file ':{*}' @1 +%mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar +%mvn_artifact %{name}:%{name}-runtime:%{version} dist/java-cup-%{pkg_version}-runtime.jar -# poms -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap - -# javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} +%mvn_install -J dist/javadoc %files -f .mfiles %doc changelog.txt -%{_javadir}/* %license licence.txt %files manual %doc manual.html %license licence.txt -%files javadoc +%files javadoc -f .mfiles-javadoc %license licence.txt -%{_javadocdir}/%{name} %changelog +* 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 From fd1b1e227d5b2cc325cf6f4ad3b8196de368b8ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 14:02:22 +0000 Subject: [PATCH 16/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index e6f60f3..1fba56c 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -95,6 +95,9 @@ zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF %license licence.txt %changelog +* 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 From 03fcdd986ea5691d9df9b01e6c944b4d2f88ce8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 25 Sep 2017 17:45:49 +0200 Subject: [PATCH 17/80] Elimitate race condition when injecting JAR manifest Resolves: rhbz#1495233 --- java_cup.spec | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 1fba56c..4ee100a 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -25,7 +25,6 @@ BuildRequires: jflex %if ! %{with_bootstrap} BuildRequires: java_cup >= 1:0.11a %endif -BuildRequires: zip %description @@ -50,6 +49,8 @@ Documentation for java_cup. # remove all binary files find -name "*.class" -delete +%mvn_file ':{*}' @1 + %if ! %{with_bootstrap} # remove prebuilt JFlex rm -rf java_cup-%{version}/bin/JFlex.jar @@ -67,17 +68,11 @@ ant -Dcupversion=20150326 -Dsvnversion=65 find -name parser.cup -delete ant javadoc -%install # inject OSGi manifests -mkdir -p META-INF -cp -p %{SOURCE2} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip -u dist/java-cup-%{pkg_version}.jar META-INF/MANIFEST.MF -cp -p %{SOURCE4} META-INF/MANIFEST.MF -touch META-INF/MANIFEST.MF -zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF +jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2} +jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} -%mvn_file ':{*}' @1 +%install %mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar %mvn_artifact %{name}:%{name}-runtime:%{version} dist/java-cup-%{pkg_version}-runtime.jar @@ -95,6 +90,10 @@ zip -u dist/java-cup-%{pkg_version}-runtime.jar META-INF/MANIFEST.MF %license licence.txt %changelog +* 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 From 37eb3b76ad13b2c0843ce6297dceac2e8ec1c9c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 18:04:33 +0000 Subject: [PATCH 18/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 4ee100a..b01dfd5 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -90,6 +90,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From 379817648b1153bbb7fe0afda5d6a0c934dae629 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 06:06:02 +0000 Subject: [PATCH 19/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index b01dfd5..337388b 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -90,6 +90,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From c7fbe6360a2f9e5d7e34a1f9ffaad9cfed1d4925 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 20/80] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e882a35..9a29652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -738656753ed84fb25c9cbe29ab9f05fc java_cup-0.11b.tar.bz2 +SHA512 (java_cup-0.11b.tar.bz2) = b5528d1e7ca193331a5c431b86d273d840bee08d7a02453ac1c9a2c9890b2f2ab889dd63b3ae123d1185ea55601e2b045f8d743170dab0648eac50f9861ab8c8 From be82dc4c1f9f1b5c7b8bd1ed1f4b53a104fd49e4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 21/80] Expand conditionals --- java_cup.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index b01dfd5..4b2b5f4 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -22,9 +22,7 @@ Patch0: %{name}-build.patch BuildRequires: ant BuildRequires: javapackages-local BuildRequires: jflex -%if ! %{with_bootstrap} BuildRequires: java_cup >= 1:0.11a -%endif %description @@ -51,18 +49,14 @@ find -name "*.class" -delete %mvn_file ':{*}' @1 -%if ! %{with_bootstrap} # remove prebuilt JFlex rm -rf java_cup-%{version}/bin/JFlex.jar # remove prebuilt java_cup, if not bootstrapping rm -rf java_cup-%{version}/bin/java-cup-11.jar -%endif %build -%if ! %{with_bootstrap} export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) -%endif ant -Dcupversion=20150326 -Dsvnversion=65 find -name parser.cup -delete From 0329ac7566e053ca4fbb0487c88cd6017baf995c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 03:55:20 +0000 Subject: [PATCH 22/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 337388b..3bd583b 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -90,6 +90,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From bd27aa30a4df004fc5b7869c5675d8564c09d4c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:44 +0200 Subject: [PATCH 23/80] Mass rebuild for javapackages-tools 201901 --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 4b2b5f4..67bfbca 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -84,6 +84,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1:0.11b-9 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1:0.11b-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 4f5afb9f5e822f615ab9e1ef97125eb8c8ccccf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 10:04:27 +0000 Subject: [PATCH 24/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 3bd583b..6e7010a 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -90,6 +90,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1:0.11b-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1:0.11b-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 79de7f21dd0c0cc52bfaeaedf71ab599262ead37 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 4 Nov 2019 10:45:50 +0100 Subject: [PATCH 25/80] Use javac 1.6 --- java_cup.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java_cup.spec b/java_cup.spec index 67bfbca..c8d8970 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -44,6 +44,8 @@ Documentation for java_cup. %setup -q %patch0 -b .build +sed -i '/ Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 26/80] Mass rebuild for javapackages-tools 201902 --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index c8d8970..158e5e6 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -86,6 +86,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1:0.11b-10 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1:0.11b-9 - Mass rebuild for javapackages-tools 201901 From 8769b34e9219aa3c1d70b4bd2b4e4bd5f717df4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 05:56:57 +0000 Subject: [PATCH 27/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 6e7010a..4829967 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -90,6 +90,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1:0.11b-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1:0.11b-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a2bb6209f3f54ba2c283f2466690bed5a08faa66 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 17 Apr 2020 11:20:19 +0200 Subject: [PATCH 28/80] Add launcher script --- java_cup.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/java_cup.spec b/java_cup.spec index 158e5e6..f730c17 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -24,6 +24,10 @@ BuildRequires: javapackages-local BuildRequires: jflex BuildRequires: java_cup >= 1:0.11a +# 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 @@ -74,7 +78,11 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %mvn_install -J dist/javadoc +# wrapper script for direct execution +%jpackage_script java_cup.Main "" "" java_cup cup true + %files -f .mfiles +%{_bindir}/cup %doc changelog.txt %license licence.txt From 9fbc75a69c1afb65c56c22e524d16641973fee9b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 May 2020 17:49:12 +0200 Subject: [PATCH 29/80] Drop version constraint on java_cup BR --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index f730c17..0fe51e0 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -22,7 +22,7 @@ Patch0: %{name}-build.patch BuildRequires: ant BuildRequires: javapackages-local BuildRequires: jflex -BuildRequires: java_cup >= 1:0.11a +BuildRequires: java_cup # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions From 587c1aa30372092e40b46311d603fefebf78c3ac Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Thu, 25 Jun 2020 14:42:26 -0400 Subject: [PATCH 30/80] Use source/target of 1.6 to build against Java 11. Signed-off-by: Roland Grunberg --- java_cup.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 4829967..83dd02e 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -59,6 +59,10 @@ rm -rf java_cup-%{version}/bin/JFlex.jar rm -rf java_cup-%{version}/bin/java-cup-11.jar %endif +# Use source/target 1.6 for Java 11 +sed -i 's/source="1.5"/source="1.6"/' build.xml +sed -i 's/target="1.5"/target="1.6"/' build.xml + %build %if ! %{with_bootstrap} export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) @@ -90,6 +94,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From ab73ed44cddf87af73a1314594fac0d65423ccb9 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 22:15:59 +0200 Subject: [PATCH 31/80] Rebuilt for JDK-11 --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 83dd02e..2a6acf9 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -94,6 +94,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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. From 638a0c6a34564f972a644dd99ea51fcc68a1c06f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:12:02 +0000 Subject: [PATCH 32/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 2a6acf9..08ecc77 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -94,6 +94,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From 0182affe36349ea3a16d163b044325b8586d3a4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:44:12 +0000 Subject: [PATCH 33/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 08ecc77..f2549a2 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -94,6 +94,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From ca0f5d170c8529885ee9d01c8608ec0b864f167a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 34/80] Conditionalize buildrequires in bootstrap mode --- java_cup.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 0fe51e0..af312aa 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,5 +1,6 @@ +%bcond_without bootstrap + %global pkg_version 11b -%global with_bootstrap 0 Name: java_cup Version: 0.11b @@ -19,10 +20,14 @@ Source4: %{name}-runtime-MANIFEST.MF Patch0: %{name}-build.patch -BuildRequires: ant BuildRequires: javapackages-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: ant BuildRequires: jflex BuildRequires: java_cup +%endif # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions From ee6e4219cd19babff751f389b443c25e0b1c97a7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 18:35:42 +0200 Subject: [PATCH 35/80] Use %ant macro --- java_cup.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index af312aa..ed65718 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -69,9 +69,9 @@ rm -rf java_cup-%{version}/bin/java-cup-11.jar %build export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) -ant -Dcupversion=20150326 -Dsvnversion=65 +%ant -Dcupversion=20150326 -Dsvnversion=65 find -name parser.cup -delete -ant javadoc +%ant javadoc # inject OSGi manifests jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2} From ecfd775a3908e46ae6cc2c3c0922ffe8c0f344aa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 36/80] Turn off bootstrap mode by default --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index ed65718..232be6c 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %global pkg_version 11b From 287472e83dac4e0896069c23586b4327107d049c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:51 +0200 Subject: [PATCH 37/80] Bootstrap build --- java_cup.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 9348da5..2451a4f 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,10 +1,10 @@ -%bcond_with bootstrap +%bcond_without bootstrap %global pkg_version 11b Name: java_cup Version: 0.11b -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -99,6 +99,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1:0.11b-17 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1:0.11b-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 6d677063299ca486c4630c6ba2a91fedd2b5bd8c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:43 +0200 Subject: [PATCH 38/80] Non-bootstrap build --- java_cup.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 2451a4f..ef51851 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %global pkg_version 11b @@ -101,6 +101,7 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %changelog * 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 From ca5d9f90f497ff7b34eb0541e29d6fcd1a080918 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:58:40 +0000 Subject: [PATCH 39/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index ef51851..4abfe6f 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -99,6 +99,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From e96a05c987c98be3fa1ca57c6d7156b8fc9ffb82 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 16:21:15 +0100 Subject: [PATCH 40/80] Bump Java compiler source/target levels to 1.7 --- java_cup.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 4abfe6f..3d31169 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -53,7 +53,7 @@ Documentation for java_cup. %setup -q %patch0 -b .build -sed -i '/ - 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 From 67f1aa835a84cdda5cbb24fac35950f7399d9707 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:41:30 +0000 Subject: [PATCH 41/80] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 3d31169..8320e40 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -99,6 +99,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From 009230ee19b64cb059698266b1e4acd86810e5d8 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 21:18:49 +0100 Subject: [PATCH 42/80] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 8320e40..89aa90d 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -99,6 +99,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From 2b536383d29e63331579a75b96b321338570a338 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 10 May 2022 10:55:18 +0200 Subject: [PATCH 43/80] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 9 +++++++++ plans/javapackages.fmf | 9 +++++++++ plans/smoke.fmf | 4 ++++ 5 files changed, 24 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf create mode 100644 plans/smoke.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..7b6e38f --- /dev/null +++ b/gating.yaml @@ -0,0 +1,9 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..85247d6 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,9 @@ +summary: + Run javapackages-specific tests +discover: + how: fmf + url: https://pagure.io/javapackages-validator-tests +execute: + how: tmt +environment: + FMF_PACKAGE: java_cup diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..dcc95fd --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,4 @@ +summary: Basic smoke test +execute: + script: + - echo 'non terminal bar; bar::=;' | cup From b4e7fb2e4d12d93b878670d71b74b78c713bc717 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 11 May 2022 15:25:37 +0200 Subject: [PATCH 44/80] Update test configuration --- plans/javapackages.fmf | 2 -- 1 file changed, 2 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 85247d6..def0914 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -5,5 +5,3 @@ discover: url: https://pagure.io/javapackages-validator-tests execute: how: tmt -environment: - FMF_PACKAGE: java_cup From 9eca3845092b01f7ba9fa7be283603bd2e9f40f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 45/80] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- java_cup.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/java_cup.spec b/java_cup.spec index 89aa90d..4186b65 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -10,6 +10,7 @@ Summary: LALR parser generator for Java License: MIT 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/ From 50bb2fa188fc8ad2375013f989154ebf5be1c9e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 10:17:13 +0200 Subject: [PATCH 46/80] Update build-requires in bootstrap mode --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 4186b65..b99d39f 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -21,10 +21,10 @@ Source4: %{name}-runtime-MANIFEST.MF Patch0: %{name}-build.patch -BuildRequires: javapackages-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: javapackages-local BuildRequires: ant BuildRequires: jflex BuildRequires: java_cup From c79f0557fb79dde1e92e69defc294c6ba20fda22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:07:23 +0000 Subject: [PATCH 47/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index b99d39f..1a708b1 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From af86b7a8f95f7d27c3ca63885c9405b0f836498c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Aug 2022 07:44:26 +0200 Subject: [PATCH 48/80] Update javapackages test plan --- plans/javapackages.fmf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index def0914..8f6c9cb 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ -summary: - Run javapackages-specific tests +summary: Run javapackages-specific tests discover: - how: fmf - url: https://pagure.io/javapackages-validator-tests + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 execute: - how: tmt + how: tmt From b654c30c3e8fca635c6aeba05505bfb0e825515d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 25 Aug 2022 09:38:51 +0200 Subject: [PATCH 49/80] Refactor smoke test --- plans/smoke.fmf | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plans/smoke.fmf b/plans/smoke.fmf index dcc95fd..6faab89 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,4 +1,9 @@ summary: Basic smoke test +discover: + how: shell + tests: + - name: /smoke/empty-grammar + test: | + echo 'non terminal bar; bar::=;' | cup execute: - script: - - echo 'non terminal bar; bar::=;' | cup + how: tmt From ec8eda71c1ee364029e8fdb18b905ac6cb8ad297 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:37:06 +0000 Subject: [PATCH 50/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 1a708b1..ca5a90a 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From 98742e2b7ea6fded248d16cdd0f0ff6ec7d502a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:55:14 +0000 Subject: [PATCH 51/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index ca5a90a..8e21446 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From de8b45b6b6076347a530c401cca7d6c9e2669951 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:59:20 +0200 Subject: [PATCH 52/80] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- java_cup.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 8e21446..e063022 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,10 +4,10 @@ Name: java_cup Version: 0.11b -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 1 Summary: LALR parser generator for Java -License: MIT +License: SMLNJ URL: http://www2.cs.tum.edu/projects/cup/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -100,6 +100,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* 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 From 3f4a453d9efaa3e707f91e7f93d9ad929802e87d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 53/80] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 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: f37 + ref: f40 execute: how: tmt From df0f903dca4e83fc1d1da19b5f6f9e87c0e5e350 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:31:56 +0000 Subject: [PATCH 54/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index e063022..804f5bd 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 25%{?dist} +Release: 26%{?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 +* 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 From ab42ee64485422b84068b6792cc64c849a1aab58 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:11:47 +0000 Subject: [PATCH 55/80] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 804f5bd..6a5fbc3 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -4,7 +4,7 @@ Name: java_cup Version: 0.11b -Release: 26%{?dist} +Release: 27%{?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 +* 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 From 12b8ee750e671183687461f13bc4b03c5c814777 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 21 Feb 2024 12:18:09 +0100 Subject: [PATCH 56/80] 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 57/80] 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 58/80] 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 59/80] 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 60/80] 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 61/80] 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 62/80] 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 63/80] 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 64/80] 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 65/80] 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 66/80] 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 67/80] 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 68/80] 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 69/80] 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 70/80] 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 71/80] 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 72/80] 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 73/80] 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 74/80] 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 75/80] 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 76/80] 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 77/80] 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 78/80] 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 79/80] 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 80/80] 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