.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,3 @@
-SOURCES/java_cup-0.11b.tar.bz2
+java_cup_v10k.tar.gz
+java_cup-0.11a.tar.bz2
+/java_cup-0.11b.tar.bz2

.java_cup.metadata

@@ -1 +0,0 @@
-0b51e6e6f759650d9d383e032e2fc10d278e9280 SOURCES/java_cup-0.11b.tar.bz2

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 <mkoncek@redhat.com>
+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})"'>
+     </replace>
+-    <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.5" target="1.5">
++    <javac srcdir="${java}" destdir="${classes}" verbose="off" listfiles="off" debug="on" source="1.8" target="1.8">
+       <classpath refid="libraries"/>
+     </javac>
+   </target>
+-- 
+2.43.0
+

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_contexts:
+  - osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/smoke.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional}

java_cup.spec

@@ -1,14 +1,16 @@
+%bcond_with bootstrap
+
 %global pkg_version     11b
-%global with_bootstrap  0
 
 Name:           java_cup
 Version:        0.11b
-Release:        10%{?dist}
+Release:        30%{?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
 
 # 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/
@@ -18,11 +20,20 @@ Source2:        %{name}-MANIFEST.MF
 Source4:        %{name}-runtime-MANIFEST.MF
 
 Patch0:         %{name}-build.patch
+Patch1:         0002-Set-Java-source-target-to-1.8.patch
 
-BuildRequires:  ant
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  javapackages-local
+BuildRequires:  ant
 BuildRequires:  jflex
-BuildRequires:  java_cup >= 1:0.11a
+BuildRequires:  java_cup
+%endif
+
+# Explicit javapackages-tools requires since scripts use
+# /usr/share/java-utils/java-functions
+Requires:       javapackages-tools
 
 
 %description
@@ -42,9 +53,8 @@ Documentation for java_cup.
 
 %prep
 %setup -q
-%patch0 -b .build
+%patch 0 -b .build
-
+%patch 1 -p1
-sed -i '/<javac/s/1.5/1.6/g' build.xml
 
 # remove all binary files
 find -name "*.class" -delete
@@ -60,9 +70,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}
@@ -74,7 +84,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
 
@@ -86,12 +100,84 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
 %license licence.txt
 
 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:0.11b-30
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Aug 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-29
+- Switch Java compiler source/target to 1.8
+- Resolves: RHEL-52689
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:0.11b-29
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:0.11b-28
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-25
+- Convert License tag to SPDX format
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:0.11b-21
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-19
+- Bump Java compiler source/target levels to 1.7
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-17
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:0.11b-14
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu Jun 25 2020 Roland Grunberg <rgrunber@redhat.com> - 1:0.11b-13
+- Use source/target of 1.6 to build against Java 11.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-10
 - Mass rebuild for javapackages-tools 201902
 
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-9
 - Mass rebuild for javapackages-tools 201901
 
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: c10s
+execute:
+  how: tmt

plans/smoke.fmf

@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+  how: fmf
+execute:
+  how: tmt

sources

@@ -0,0 +1 @@
+SHA512 (java_cup-0.11b.tar.bz2) = b5528d1e7ca193331a5c431b86d273d840bee08d7a02453ac1c9a2c9890b2f2ab889dd63b3ae123d1185ea55601e2b045f8d743170dab0648eac50f9861ab8c8

tests/Sanity/smoke/empty.cup

@@ -0,0 +1,2 @@
+non terminal bar;
+bar::=;

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

tests/Sanity/smoke/runtest.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
+. /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

tests/main.fmf

@@ -0,0 +1,4 @@
+contact: Mikolaj Izdebski <mizdebsk@redhat.com>
+framework: beakerlib
+test: ./runtest.sh
+tier: 0