From eeaaf154c0ea4a698dbdfb7f1ba30321f115ef39 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 3 Apr 2023 18:10:16 -0600 Subject: [PATCH 01/32] Bootstrap build for EPEL9 --- javacc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index fe5561b..b5b36cf 100644 --- a/javacc.spec +++ b/javacc.spec @@ -29,7 +29,7 @@ # # Build in bootstrap mode on new architectures -%bcond_with bootstrap +%bcond_without bootstrap Name: javacc Version: 7.0.12 From adca64b220b9853a7a7fe4a3159a2dd23b6ed029 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 3 Apr 2023 19:50:57 -0600 Subject: [PATCH 02/32] Revert "Bootstrap build for EPEL9" This reverts commit eeaaf154c0ea4a698dbdfb7f1ba30321f115ef39. --- javacc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index b5b36cf..fe5561b 100644 --- a/javacc.spec +++ b/javacc.spec @@ -29,7 +29,7 @@ # # Build in bootstrap mode on new architectures -%bcond_without bootstrap +%bcond_with bootstrap Name: javacc Version: 7.0.12 From 06b3e0e5f95b2aec6494feeba1668af60e81c427 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:55:26 +0000 Subject: [PATCH 03/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- javacc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index fe5561b..a155893 100644 --- a/javacc.spec +++ b/javacc.spec @@ -33,7 +33,7 @@ Name: javacc Version: 7.0.12 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -157,6 +157,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0:7.0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Apr 1 2023 Jerry James - 0:7.0.12-1 - Update to 7.0.12 - Convert License tag to SPDX From 8e5048e657a0ac6d1e0faf361ff93e8634f2e36b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 26 Aug 2023 09:54:00 +0200 Subject: [PATCH 04/32] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 9 +++++++ plans/javapackages.fmf | 7 +++++ plans/smoke.fmf | 5 ++++ tests/Sanity/smoke/main.fmf | 4 +++ tests/Sanity/smoke/runtest.sh | 48 +++++++++++++++++++++++++++++++++ tests/Sanity/smoke/smoke.jj | 50 +++++++++++++++++++++++++++++++++++ tests/main.fmf | 4 +++ 9 files changed, 129 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 create mode 100644 tests/Sanity/smoke/main.fmf create mode 100755 tests/Sanity/smoke/runtest.sh create mode 100644 tests/Sanity/smoke/smoke.jj create mode 100644 tests/main.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..0cbb629 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f39 +execute: + how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..a1e7bfd --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..0ff8dc2 --- /dev/null +++ b/tests/Sanity/smoke/main.fmf @@ -0,0 +1,4 @@ +summary: javacc smoke test +description: | + Test basic functionality of javacc. +require: java-devel diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..2dec9db --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# Author: Mikolaj Izdebski +. /usr/share/beakerlib/beakerlib.sh + +rlJournalStart + + rlPhaseStartTest "check for presence of javacc commands" + rlAssertRpm javacc + rlAssertBinaryOrigin javacc javacc + rlAssertBinaryOrigin javacc.sh javacc + rlAssertBinaryOrigin jjtree javacc + rlAssertBinaryOrigin jjdoc javacc + rlPhaseEnd + + rlPhaseStartTest "display javacc version" + rlRun -s "javacc" 1 + rlAssertGrep "^Java Compiler Compiler Version" $rlRun_LOG + rlAssertGrep "Parser Generator" $rlRun_LOG + rlRun -s "javacc.sh" 1 + rlAssertGrep "^Java Compiler Compiler Version" $rlRun_LOG + rlAssertGrep "Parser Generator" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display jjtree version" + rlRun -s "jjtree" 1 + rlAssertGrep "^Java Compiler Compiler Version" $rlRun_LOG + rlAssertGrep "Tree Builder" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "display jjdoc version" + rlRun -s "jjdoc" 1 + rlAssertGrep "^Java Compiler Compiler Version" $rlRun_LOG + rlAssertGrep "Documentation Generator" $rlRun_LOG + rlPhaseEnd + + rlPhaseStartTest "generate, compile and run a simple parser" + rlRun -s "javacc smoke.jj" + rlAssertExists "Smoke.java" + rlRun -s "javac *.java" + rlRun -s "java -cp . Smoke '{}'" + rlAssertNotGrep "." $rlRun_LOG + rlRun -s "java -cp . Smoke '{{}'" 1 + rlAssertGrep "ParseException" $rlRun_LOG + rlAssertGrep "EOF" $rlRun_LOG + rlPhaseEnd + +rlJournalEnd +rlJournalPrintText diff --git a/tests/Sanity/smoke/smoke.jj b/tests/Sanity/smoke/smoke.jj new file mode 100644 index 0000000..22977d7 --- /dev/null +++ b/tests/Sanity/smoke/smoke.jj @@ -0,0 +1,50 @@ +options { + LOOKAHEAD = 1; + CHOICE_AMBIGUITY_CHECK = 2; + OTHER_AMBIGUITY_CHECK = 1; + STATIC = true; + DEBUG_PARSER = false; + DEBUG_LOOKAHEAD = false; + DEBUG_TOKEN_MANAGER = false; + ERROR_REPORTING = true; + JAVA_UNICODE_ESCAPE = false; + UNICODE_INPUT = false; + IGNORE_CASE = false; + USER_TOKEN_MANAGER = false; + USER_CHAR_STREAM = false; + BUILD_PARSER = true; + BUILD_TOKEN_MANAGER = true; + SANITY_CHECK = true; + FORCE_LA_CHECK = false; +} + +PARSER_BEGIN(Smoke) + +/** + * Simple brace matcher. + */ +public class Smoke { + + /** Main entry point. */ + public static void main(String args[]) throws ParseException { + Smoke parser = new Smoke(new java.io.StringReader(args[0])); + parser.Input(); + } + +} + +PARSER_END(Smoke) + +/** Root production. */ +void Input() : +{} +{ + MatchedBraces() ("\n"|"\r")* +} + +/** Brace matching production. */ +void MatchedBraces() : +{} +{ + "{" [ MatchedBraces() ] "}" +} diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..9e2ea10 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +contact: Mikolaj Izdebski +framework: beakerlib +test: ./runtest.sh +tier: 1 From 527d9d9d5bc5052db221a8eac7f4e2727a02997e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 26 Aug 2023 09:00:46 +0200 Subject: [PATCH 05/32] Simplify symlink creation --- javacc.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/javacc.spec b/javacc.spec index a155893..f155254 100644 --- a/javacc.spec +++ b/javacc.spec @@ -134,14 +134,10 @@ ant jar javadoc -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 %mvn_install -J target/javadoc %jpackage_script javacc '' '' javacc javacc true -ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh +ln -s javacc %{buildroot}%{_bindir}/javacc.sh %jpackage_script jjdoc '' '' javacc jjdoc true %jpackage_script jjtree '' '' javacc jjtree true -# Swizzle an absolute symlink into a relative symlink -rm %{buildroot}%{_bindir}/javacc.sh -ln -s javacc %{buildroot}%{_bindir}/javacc.sh - %files -f .mfiles %license LICENSE %doc README.md From a8e43f151710e00ac78694863b360d60505d1caf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Aug 2023 07:34:02 +0200 Subject: [PATCH 06/32] Bootstrap using javapackages-bootstrap --- javacc.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/javacc.spec b/javacc.spec index f155254..37f4e33 100644 --- a/javacc.spec +++ b/javacc.spec @@ -33,7 +33,7 @@ Name: javacc Version: 7.0.12 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -52,9 +52,11 @@ Patch0: 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch # https://github.com/javacc/javacc/pull/259 Patch1: 0002-Remove-extraneous-Deprecated-annotations.patch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: javapackages-local BuildRequires: ant -%if %{without bootstrap} BuildRequires: javacc %endif @@ -97,10 +99,8 @@ Examples for %{name}. %prep %autosetup -n %{name}-%{name}-%{version} -p1 -%if %{without bootstrap} # Remove binary information in the source tar find . -name "*.jar" -delete -%endif find examples -name .gitignore -delete fixtimestamp() { @@ -117,13 +117,15 @@ sed -i.orig 's/\r//' examples/JJTreeExamples/cpp/eg3.jjt fixtimestamp examples/JJTreeExamples/cpp/eg3.jjt %build -%if %{without bootstrap} +%if %{with bootstrap} +cp $(find-jar javapackages-bootstrap/javacc) bootstrap/javacc.jar +%else build-jar-repository -p bootstrap javacc %endif # There is maven pom which doesn't really work for building. The tests don't # work either (even when using bundled jars). -ant jar javadoc -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 +%ant jar javadoc -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 # The pom dependencies are also wrong %mvn_artifact --skip-dependencies pom.xml target/javacc.jar @@ -153,6 +155,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Sat Aug 26 2023 Mikolaj Izdebski - 0:7.0.12-3 +- Bootstrap using javapackages-bootstrap + * Thu Jul 20 2023 Fedora Release Engineering - 0:7.0.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ad7241b5e1fbde811b7e8a96d48017d80af61d54 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 15:58:22 +0200 Subject: [PATCH 07/32] Rebuild --- javacc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index 37f4e33..86b8717 100644 --- a/javacc.spec +++ b/javacc.spec @@ -33,7 +33,7 @@ Name: javacc Version: 7.0.12 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -155,6 +155,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 0:7.0.12-4 +- Rebuild + * Sat Aug 26 2023 Mikolaj Izdebski - 0:7.0.12-3 - Bootstrap using javapackages-bootstrap From d418395be28545763cb8454c5f88d1cfcba1e605 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 17 Nov 2023 08:54:34 -0700 Subject: [PATCH 08/32] Update to 7.0.13 Drop upstreamed duplicated @Deprecated annotations patch --- .gitignore | 1 + ...ve-extraneous-Deprecated-annotations.patch | 50 --- javacc-javadoc.patch | 94 ------ javacc-template-javadoc.patch | 306 ------------------ javacc.spec | 11 +- sources | 2 +- 6 files changed, 8 insertions(+), 456 deletions(-) delete mode 100644 0002-Remove-extraneous-Deprecated-annotations.patch delete mode 100644 javacc-javadoc.patch delete mode 100644 javacc-template-javadoc.patch diff --git a/.gitignore b/.gitignore index a61efb5..1e12c11 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ javacc-5.0src.tar.gz /release_7_0_2.tar.gz /7.0.4.tar.gz /javacc-7.0.12.tar.gz +/javacc-7.0.13.tar.gz diff --git a/0002-Remove-extraneous-Deprecated-annotations.patch b/0002-Remove-extraneous-Deprecated-annotations.patch deleted file mode 100644 index 59c87ad..0000000 --- a/0002-Remove-extraneous-Deprecated-annotations.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 64614546bd0c24469603241acd80dcb2c8035c8c Mon Sep 17 00:00:00 2001 -From: Jerry James -Date: Mon, 27 Mar 2023 15:34:48 -0600 -Subject: [PATCH] Remove extraneous @Deprecated annotations - ---- - .../resources/templates/gwt/SimpleCharStream.template | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/src/main/resources/templates/gwt/SimpleCharStream.template b/src/main/resources/templates/gwt/SimpleCharStream.template -index 9c88437..a1de1e3 100644 ---- a/src/main/resources/templates/gwt/SimpleCharStream.template -+++ b/src/main/resources/templates/gwt/SimpleCharStream.template -@@ -215,14 +215,13 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class SimpleCharStream - return c; - } - --#if GENERATE_ANNOTATIONS -- @Deprecated --#fi - /** - * @deprecated - * @see #getEndColumn - */ -+#if GENERATE_ANNOTATIONS - @Deprecated -+#fi - ${PREFIX}public int getColumn() { - #if KEEP_LINE_COLUMN - return bufcolumn[bufpos]; -@@ -231,14 +230,13 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public :}class SimpleCharStream - #fi - } - --#if GENERATE_ANNOTATIONS -- @Deprecated --#fi - /** - * @deprecated - * @see #getEndLine - */ -+#if GENERATE_ANNOTATIONS - @Deprecated -+#fi - ${PREFIX}public int getLine() { - #if KEEP_LINE_COLUMN - return bufline[bufpos]; --- -2.39.2 - diff --git a/javacc-javadoc.patch b/javacc-javadoc.patch deleted file mode 100644 index 81a2d83..0000000 --- a/javacc-javadoc.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/NonTerminal.java.orig 2022-12-23 03:58:07.000000000 -0700 -+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/NonTerminal.java 2023-03-25 15:06:29.752641666 -0600 -@@ -94,28 +94,28 @@ public String getName() { - } - - /** -- * @param argument_tokens the argument_tokens to set -+ * @param parametrized_type__tokens the parametrized type tokens to set - */ --public void setParametrizedTypeTokens(List argument_tokens) { -- this.argument_tokens = argument_tokens; -+public void setParametrizedTypeTokens(List parametrized_type__tokens) { -+ this.parametrized_type__tokens = parametrized_type__tokens; - } - - /** -- * @return the argument_tokens -+ * @return the parametrized type tokens - */ - public List getParametrizedTypeTokens() { - return parametrized_type__tokens; - } - - /** -- * @param argument_tokens the argument_tokens to set -+ * @param argument_tokens the argument tokens to set - */ --public void setArgumentTokens(List parametrized_type__tokens) { -- this.parametrized_type__tokens = parametrized_type__tokens; -+public void setArgumentTokens(List argument_tokens) { -+ this.argument_tokens = argument_tokens; - } - - /** -- * @return the argument_tokens -+ * @return the argument tokens - */ - public List getArgumentTokens() { - return argument_tokens; ---- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/ROneOrMore.java.orig 2022-12-23 03:58:07.000000000 -0700 -+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/ROneOrMore.java 2023-03-25 14:54:33.946649796 -0600 -@@ -29,7 +29,7 @@ - package org.javacc.parser; - - /** -- * Describes one-or-more regular expressions (). -+ * Describes one-or-more regular expressions (<foo+>). - */ - - public class ROneOrMore extends RegularExpression { ---- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RRepetitionRange.java.orig 2022-12-23 03:58:07.000000000 -0700 -+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RRepetitionRange.java 2023-03-25 14:55:02.786247660 -0600 -@@ -31,7 +31,7 @@ import java.util.ArrayList; - import java.util.List; - - /** -- * Describes one-or-more regular expressions (). -+ * Describes one-or-more regular expressions (<foo+>). - */ - - public class RRepetitionRange extends RegularExpression { ---- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RZeroOrMore.java.orig 2022-12-23 03:58:07.000000000 -0700 -+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RZeroOrMore.java 2023-03-25 14:55:21.049992983 -0600 -@@ -29,7 +29,7 @@ - package org.javacc.parser; - - /** -- * Describes zero-or-more regular expressions (). -+ * Describes zero-or-more regular expressions (<foo*>). - */ - - public class RZeroOrMore extends RegularExpression { ---- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RZeroOrOne.java.orig 2022-12-23 03:58:07.000000000 -0700 -+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/RZeroOrOne.java 2023-03-25 14:55:40.577720078 -0600 -@@ -28,7 +28,7 @@ - package org.javacc.parser; - - /** -- * Describes zero-or-one regular expressions (). -+ * Describes zero-or-one regular expressions (<foo?>). - */ - - public class RZeroOrOne extends RegularExpression { ---- javacc-javacc-7.0.12/src/main/java/org/javacc/parser/TokenProduction.java.orig 2022-12-23 03:58:07.000000000 -0700 -+++ javacc-javacc-7.0.12/src/main/java/org/javacc/parser/TokenProduction.java 2023-03-25 15:06:51.760333891 -0600 -@@ -61,7 +61,7 @@ public class TokenProduction { - - /** - * The states in which this regular expression production exists. If -- * this array is null, then "<*>" has been specified and this regular -+ * this array is null, then "<*>" has been specified and this regular - * expression exists in all states. However, this null value is - * replaced by a String array that includes all lexical state names - * during the semanticization phase. diff --git a/javacc-template-javadoc.patch b/javacc-template-javadoc.patch deleted file mode 100644 index e56cc7c..0000000 --- a/javacc-template-javadoc.patch +++ /dev/null @@ -1,306 +0,0 @@ ---- javacc-javacc-7.0.12/src/main/resources/templates/gwt/SimpleCharStream.template.orig 2022-12-23 03:58:07.000000000 -0700 -+++ javacc-javacc-7.0.12/src/main/resources/templates/gwt/SimpleCharStream.template 2023-03-26 11:28:53.769605854 -0600 -@@ -215,14 +215,13 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public - return c; - } - --#if GENERATE_ANNOTATIONS -- @Deprecated --#fi - /** - * @deprecated - * @see #getEndColumn - */ -+#if GENERATE_ANNOTATIONS - @Deprecated -+#fi - ${PREFIX}public int getColumn() { - #if KEEP_LINE_COLUMN - return bufcolumn[bufpos]; -@@ -231,14 +230,13 @@ ${SUPPORT_CLASS_VISIBILITY_PUBLIC?public - #fi - } - --#if GENERATE_ANNOTATIONS -- @Deprecated --#fi - /** - * @deprecated - * @see #getEndLine - */ -+#if GENERATE_ANNOTATIONS - @Deprecated -+#fi - ${PREFIX}public int getLine() { - #if KEEP_LINE_COLUMN - return bufline[bufpos]; ---- javacc-javacc-7.0.12/src/main/resources/templates/JavaCharStream.template.orig 2022-12-23 03:58:07.000000000 -0700 -+++ javacc-javacc-7.0.12/src/main/resources/templates/JavaCharStream.template 2023-03-25 10:14:49.496652118 -0600 -@@ -58,39 +58,66 @@ class JavaCharStream - throw new java.io.IOException(); // Should never come here - } - --/* Position in buffer. */ -+ /** Position in buffer. */ - ${PREFIX}public int bufpos = -1; -+ /** Size of the buffer. */ - ${PREFIX}int bufsize; -+ /** Number of characters available in the buffer. */ - ${PREFIX}int available; -+ /** Buffer position of the first character of the current token. */ - ${PREFIX}int tokenBegin; - #if KEEP_LINE_COLUMN -+ /** Line number of each buffer character. */ - ${PREFIX}protected int bufline[]; -+ /** Column number of each buffer character. */ - ${PREFIX}protected int bufcolumn[]; - -+ /** Current column number. */ - ${PREFIX}protected int column = 0; -+ /** Current line number. */ - ${PREFIX}protected int line = 1; - -+ /** True if the previous character is a carriage return. */ - ${PREFIX}protected boolean prevCharIsCR = false; -+ /** True if the previous character is a linefeed. */ - ${PREFIX}protected boolean prevCharIsLF = false; - #fi - -+ /** The input stream from which characters are read. */ - ${PREFIX}protected java.io.Reader inputStream; - -+ /** The buffer containing the next character. */ - ${PREFIX}protected char[] nextCharBuf; -+ /* The buffer. */ - ${PREFIX}protected char[] buffer; -+ /** Index one beyond the last character in the buffer. */ - ${PREFIX}protected int maxNextCharInd = 0; -+ /** Index of the next character in the buffer. */ - ${PREFIX}protected int nextCharInd = -1; -+ /** The number of characters in the buffer. */ - ${PREFIX}protected int inBuf = 0; -+ /** The tab size. */ - ${PREFIX}protected int tabSize = 1; -+ /** Whether to track the line and column. */ - #if KEEP_LINE_COLUMN - ${PREFIX}protected boolean trackLineColumn = true; - #else - ${PREFIX}protected boolean trackLineColumn = false; - #fi - -+ /** Set the tab size. -+ * @param i the tab size -+ */ - ${PREFIX}public void setTabSize(int i) { tabSize = i; } -+ /** Get the tab size. -+ * @return the tab size. -+ */ - ${PREFIX}public int getTabSize() { return tabSize; } - -+/** -+ * Make the buffer bigger. -+ * @param wrapAround true if the buffer wraps around -+ */ - ${PREFIX}protected void ExpandBuff(boolean wrapAround) - { - char[] newbuffer = new char[bufsize + 2048]; -@@ -144,6 +171,10 @@ class JavaCharStream - tokenBegin = 0; - } - -+/** -+ * Fill the buffer. -+ * @throws java.io.IOException an exception occurs while filling the buffer -+ */ - ${PREFIX}protected void FillBuff() throws java.io.IOException - { - int i; -@@ -178,6 +209,11 @@ class JavaCharStream - } - } - -+/** -+ * Read one byte. -+ * @return the byte -+ * @throws java.io.IOException an exception occurs while filling the buffer -+ */ - ${PREFIX}protected char ReadByte() throws java.io.IOException - { - if (++nextCharInd >= maxNextCharInd) -@@ -186,7 +222,11 @@ class JavaCharStream - return nextCharBuf[nextCharInd]; - } - --/* @return starting character for token. */ -+/** -+ * Get the first character of the token. -+ * @return starting character for token. -+ * @throws java.io.IOException an exception occurs while fetching a character -+ */ - ${PREFIX}public char BeginToken() throws java.io.IOException - { - if (inBuf > 0) -@@ -206,6 +246,9 @@ class JavaCharStream - return readChar(); - } - -+/** -+ * Get more buffer space if needed. -+ */ - ${PREFIX}protected void AdjustBuffSize() - { - if (available == bufsize) -@@ -227,6 +270,9 @@ class JavaCharStream - } - #if KEEP_LINE_COLUMN - -+/** Update line and column due to adding a character. -+ * @param c the character that is added -+ */ - ${PREFIX}protected void UpdateLineColumn(char c) - { - column++; -@@ -268,7 +314,10 @@ class JavaCharStream - } - #fi - --/* Read a character. */ -+/** Read a character. -+ * @return the character that is read -+ * @throws java.io.IOException an error occurred while reading the character -+ */ - ${PREFIX}public char readChar() throws java.io.IOException - { - if (inBuf > 0) -@@ -378,9 +427,10 @@ class JavaCharStream - } - } - -- /* -+ /** - * @deprecated - * @see #getEndColumn -+ * @return the column number. - */ - #if GENERATE_ANNOTATIONS - @Deprecated -@@ -393,7 +443,7 @@ class JavaCharStream - #fi - } - -- /* -+ /** - * @deprecated - * @see #getEndLine - * @return the line number. -@@ -450,7 +500,9 @@ class JavaCharStream - #fi - } - --/** Retreat. */ -+/** Retreat. -+ * @param amount number of characters to back up -+ */ - ${PREFIX}public void backup(int amount) { - - inBuf += amount; -@@ -501,13 +553,17 @@ class JavaCharStream - - /** Constructor. - * @param dstream the underlying data source. -- * @param startline line number of the first character of the stream, mostly for error messages. - */ - public JavaCharStream(java.io.Reader dstream) - { - this(dstream, 1, 1, 4096); - } --/* Reinitialise. */ -+/** Reinitialise. -+ * @param dstream the underlying data source. -+ * @param startline line number of the first character of the stream, mostly for error messages. -+ * @param startcolumn column number of the first character of the stream. -+ * @param buffersize size of the buffer -+ */ - public void ReInit(java.io.Reader dstream, - int startline, int startcolumn, int buffersize) - { -@@ -534,19 +590,32 @@ class JavaCharStream - nextCharInd = bufpos = -1; - } - --/* Reinitialise. */ -+/** Reinitialise. -+ * @param dstream the underlying data source. -+ * @param startline line number of the first character of the stream, mostly for error messages. -+ * @param startcolumn column number of the first character of the stream. -+ */ - public void ReInit(java.io.Reader dstream, - int startline, int startcolumn) - { - ReInit(dstream, startline, startcolumn, 4096); - } - --/* Reinitialise. */ -+/** Reinitialise. -+ * @param dstream the underlying data source. -+ */ - public void ReInit(java.io.Reader dstream) - { - ReInit(dstream, 1, 1, 4096); - } --/** Constructor. */ -+/** Constructor. -+ * @param dstream the underlying data source. -+ * @param encoding the character encoding of the data stream. -+ * @param startline line number of the first character of the stream, mostly for error messages. -+ * @param startcolumn column number of the first character of the stream. -+ * @param buffersize size of the buffer -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. -+ */ - public JavaCharStream(java.io.InputStream dstream, String encoding, int startline, - int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException - { -@@ -570,7 +639,7 @@ class JavaCharStream - * @param encoding the character encoding of the data stream. - * @param startline line number of the first character of the stream, mostly for error messages. - * @param startcolumn column number of the first character of the stream. -- * @throws UnsupportedEncodingException encoding is invalid or unsupported. -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public JavaCharStream(java.io.InputStream dstream, String encoding, int startline, - int startcolumn) throws java.io.UnsupportedEncodingException -@@ -592,7 +661,7 @@ class JavaCharStream - /** Constructor. - * @param dstream the underlying data source. - * @param encoding the character encoding of the data stream. -- * @throws UnsupportedEncodingException encoding is invalid or unsupported. -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException - { -@@ -613,6 +682,7 @@ class JavaCharStream - * @param startline line number of the first character of the stream, mostly for error messages. - * @param startcolumn column number of the first character of the stream. - * @param buffersize size of the buffer -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public void ReInit(java.io.InputStream dstream, String encoding, int startline, - int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException -@@ -636,7 +706,7 @@ class JavaCharStream - * @param encoding the character encoding of the data stream. - * @param startline line number of the first character of the stream, mostly for error messages. - * @param startcolumn column number of the first character of the stream. -- * @throws UnsupportedEncodingException encoding is invalid or unsupported. -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public void ReInit(java.io.InputStream dstream, String encoding, int startline, - int startcolumn) throws java.io.UnsupportedEncodingException -@@ -656,7 +726,7 @@ class JavaCharStream - /** Reinitialise. - * @param dstream the underlying data source. - * @param encoding the character encoding of the data stream. -- * @throws UnsupportedEncodingException encoding is invalid or unsupported. -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException - { diff --git a/javacc.spec b/javacc.spec index 86b8717..0cb6e57 100644 --- a/javacc.spec +++ b/javacc.spec @@ -32,8 +32,8 @@ %bcond_with bootstrap Name: javacc -Version: 7.0.12 -Release: 4%{?dist} +Version: 7.0.13 +Release: 1%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -48,9 +48,6 @@ Source0: https://github.com/javacc/javacc/archive/%{name}-%{version}.tar. # Fix javadoc errors in the JavaCharStream template # https://github.com/javacc/javacc/pull/257 Patch0: 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch -# Remove duplicate @Deprecated annotations -# https://github.com/javacc/javacc/pull/259 -Patch1: 0002-Remove-extraneous-Deprecated-annotations.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -155,6 +152,10 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Fri Nov 17 2023 Jerry James - 0:7.0.13-1 +- Update to 7.0.13 +- Drop upstreamed duplicated @Deprecated annotations patch + * Fri Sep 01 2023 Mikolaj Izdebski - 0:7.0.12-4 - Rebuild diff --git a/sources b/sources index e45e107..e225488 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (javacc-7.0.12.tar.gz) = 963983d39696705051cf568201a17ccc63995f90572782fdbf2b1df4d20b682f7b6f69b5d7e950db9e27f30eac961b483e813bccb91a10365e0836b905cbe3fc +SHA512 (javacc-7.0.13.tar.gz) = ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144 From 7cc5d2b797bb116432074fe0d9983eafb753f637 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 09/32] 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 0cbb629..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: f39 + ref: f40 execute: how: tmt From b629de5ab595987b8ed747394134210ea1116f7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:32:05 +0000 Subject: [PATCH 10/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- javacc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index 0cb6e57..c761e38 100644 --- a/javacc.spec +++ b/javacc.spec @@ -33,7 +33,7 @@ Name: javacc Version: 7.0.13 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -152,6 +152,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 0:7.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Nov 17 2023 Jerry James - 0:7.0.13-1 - Update to 7.0.13 - Drop upstreamed duplicated @Deprecated annotations patch From 319fc600aac8030e82182691a625ec86ba099744 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:11:56 +0000 Subject: [PATCH 11/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- javacc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index c761e38..8f6a17f 100644 --- a/javacc.spec +++ b/javacc.spec @@ -33,7 +33,7 @@ Name: javacc Version: 7.0.13 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -152,6 +152,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0:7.0.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 0:7.0.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From fe496eb0ad0c4d77476aaecc838357dc6ea34ecd Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:22:44 +0100 Subject: [PATCH 12/32] 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 --- javacc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index 8f6a17f..f0779d5 100644 --- a/javacc.spec +++ b/javacc.spec @@ -33,7 +33,7 @@ Name: javacc Version: 7.0.13 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -152,6 +152,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Fri Feb 23 2024 Jiri Vanek - 0:7.0.13-4 +- bump of release for for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 0:7.0.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 13f860a345141efc62126bc94c00239c64ef0e2e Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:05:07 +0100 Subject: [PATCH 13/32] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- javacc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index f0779d5..8d3ba2b 100644 --- a/javacc.spec +++ b/javacc.spec @@ -33,7 +33,7 @@ Name: javacc Version: 7.0.13 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -152,6 +152,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Tue Feb 27 2024 Jiri Vanek - 0:7.0.13-5 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 0:7.0.13-4 - bump of release for for java-21-openjdk as system jdk From 0777dc670e4e97afd8b403f39e9797a8982c0fc5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Jun 2024 16:24:56 +0200 Subject: [PATCH 14/32] Tests should explicitly require package under test --- tests/Sanity/smoke/main.fmf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf index 0ff8dc2..0b1dc14 100644 --- a/tests/Sanity/smoke/main.fmf +++ b/tests/Sanity/smoke/main.fmf @@ -1,4 +1,6 @@ summary: javacc smoke test description: | Test basic functionality of javacc. -require: java-devel +require: + - javacc + - java-devel From e5ef0ce4017e85cb5a0468cbc0e069771a88413c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 16 Jul 2024 18:32:54 -0600 Subject: [PATCH 15/32] Minor spec file simplifications --- javacc.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/javacc.spec b/javacc.spec index 8d3ba2b..f70dab4 100644 --- a/javacc.spec +++ b/javacc.spec @@ -29,7 +29,9 @@ # # Build in bootstrap mode on new architectures -%bcond_with bootstrap +%bcond bootstrap 0 + +%global giturl https://github.com/javacc/javacc Name: javacc Version: 7.0.13 @@ -44,10 +46,11 @@ Summary: A parser/scanner generator for java # - src/main/java/org/javacc/utils/OutputFileGenerator.java License: BSD-3-Clause AND BSD-2-Clause URL: https://javacc.org/ -Source0: https://github.com/javacc/javacc/archive/%{name}-%{version}.tar.gz +VCS: git:%{giturl}.git +Source: %{giturl}/archive/%{name}-%{version}.tar.gz # Fix javadoc errors in the JavaCharStream template # https://github.com/javacc/javacc/pull/257 -Patch0: 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch +Patch: 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From b78d906393a6d3436bff61eca1934b4c3b77d110 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:52:29 +0000 Subject: [PATCH 16/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- javacc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index f70dab4..99e68a6 100644 --- a/javacc.spec +++ b/javacc.spec @@ -35,7 +35,7 @@ Name: javacc Version: 7.0.13 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -155,6 +155,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0:7.0.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 0:7.0.13-5 - Rebuilt for java-21-openjdk as system jdk From ab8e9d3d87312bbfcb5cd56f3ceef9c169cf749a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 30 Jul 2024 13:38:14 +0200 Subject: [PATCH 17/32] Adjust bootstrap build for javapackages-bootstrap update --- javacc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/javacc.spec b/javacc.spec index 99e68a6..9ceb77f 100644 --- a/javacc.spec +++ b/javacc.spec @@ -35,7 +35,7 @@ Name: javacc Version: 7.0.13 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: A parser/scanner generator for java @@ -118,7 +118,7 @@ fixtimestamp examples/JJTreeExamples/cpp/eg3.jjt %build %if %{with bootstrap} -cp $(find-jar javapackages-bootstrap/javacc) bootstrap/javacc.jar +cp %{_prefix}/lib/javapackages-bootstrap/javacc.jar bootstrap/javacc.jar %else build-jar-repository -p bootstrap javacc %endif @@ -155,6 +155,9 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog +* Tue Jul 30 2024 Mikolaj Izdebski - 0:7.0.13-7 +- Adjust bootstrap build for javapackages-bootstrap update + * Thu Jul 18 2024 Fedora Release Engineering - 0:7.0.13-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a2f5f324bd9f01891775d6c85a558785c72a0ea3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 18/32] 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 b7d5ff9c2a1668d4b28a5f30ac802a18b2f3e209 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:32:53 +0200 Subject: [PATCH 19/32] Use %autosetup -C --- javacc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index 9ceb77f..4b6bea8 100644 --- a/javacc.spec +++ b/javacc.spec @@ -97,7 +97,7 @@ Examples for %{name}. %javadoc_package %prep -%autosetup -n %{name}-%{name}-%{version} -p1 +%autosetup -p1 -C # Remove binary information in the source tar find . -name "*.jar" -delete From 9e92d9ed85457fc7ab6bac1cb153761d67cabe2a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:06 +0200 Subject: [PATCH 20/32] Convert to %autorelease and %autochangelog --- changelog | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++ javacc.spec | 215 +--------------------------------------------------- 2 files changed, 214 insertions(+), 213 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..9d8f6f0 --- /dev/null +++ b/changelog @@ -0,0 +1,212 @@ +* Tue Jul 30 2024 Mikolaj Izdebski - 0:7.0.13-7 +- Adjust bootstrap build for javapackages-bootstrap update + +* Thu Jul 18 2024 Fedora Release Engineering - 0:7.0.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 0:7.0.13-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 0:7.0.13-4 +- bump of release for for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 0:7.0.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 0:7.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Nov 17 2023 Jerry James - 0:7.0.13-1 +- Update to 7.0.13 +- Drop upstreamed duplicated @Deprecated annotations patch + +* Fri Sep 01 2023 Mikolaj Izdebski - 0:7.0.12-4 +- Rebuild + +* Sat Aug 26 2023 Mikolaj Izdebski - 0:7.0.12-3 +- Bootstrap using javapackages-bootstrap + +* Thu Jul 20 2023 Fedora Release Engineering - 0:7.0.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Apr 1 2023 Jerry James - 0:7.0.12-1 +- Update to 7.0.12 +- Convert License tag to SPDX +- Add bootstrap build mode +- Add patch to fix javadoc errors in the JavaCharStream template +- Add patch to remove duplicate @Deprecated annotations + +* Thu Jan 19 2023 Fedora Release Engineering - 0:7.0.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0:7.0.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 0:7.0.4-12 +- Rebuilt for Drop i686 JDKs + +* Sat Feb 05 2022 Jiri Vanek - 0:7.0.4-11 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 0:7.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0:7.0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0:7.0.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0:7.0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 20 2020 Mat Booth - 0:7.0.4-6 +- Force generation of 1.8 level bytecode to avoid breaking dependent packages + that require Java 8 + +* Fri Jul 10 2020 Jiri Vanek - 0:7.0.4-5 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 0:7.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0:7.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0:7.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Oct 26 2018 Marian Koncek - 0:7.0.4-1 +- Update to upstream version 7.0.4 +- Resolves: rhbz#1593262 + +* Tue Jul 31 2018 Severin Gehwolf - 0:7.0.2-6 +- Add requirement on javapackages-tools for scripts using + java-functions. + +* Fri Jul 13 2018 Fedora Release Engineering - 0:7.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0:7.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0:7.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0:7.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 16 2017 Michael Simacek - 0:7.0.2-1 +- Update to upstream version 7.0.2 + +* Mon Jan 02 2017 Michael Simacek - 0:7.0.1-1 +- Update to upstream version 7.0.1 + +* Tue Sep 06 2016 Michael Simacek - 0:6.1.3-1 +- Update to upstream version 6.1.3 +- Use new upstream location +- Generate scripts with jpackage_script + +* Tue Aug 23 2016 Michael Simacek - 0:6.1.2-1 +- Update to upstream version 6.1.2 + +* Thu Feb 04 2016 Fedora Release Engineering - 0:5.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0:5.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0:5.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Mikolaj Izdebski - 0:5.0-11 +- Use .mfiles generated during build + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:5.0-10 +- Use Requires: java-headless rebuild (#1067528) + +* Tue Jul 30 2013 Michal Srb - 0:5.0-9 +- Generate javadoc +- Drop group tag + +* Thu Feb 14 2013 Fedora Release Engineering - 0:5.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 0:5.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 28 2012 Jaromir Capik 0:5.0-6 +- Fixing #835786 - javacc: Invalid upstream URL +- Minor spec file changes according to the latest guidelines + +* Fri Jan 13 2012 Fedora Release Engineering - 0:5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 0:5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jul 13 2010 Alexander Kurtakov 0:5.0-3 +- Fix examples line endings. + +* Fri Jun 4 2010 Alexander Kurtakov 0:5.0-2 +- Apply changes requested in review bug (rhbz#225940). + +* Thu Feb 11 2010 Alexander Kurtakov 0:5.0-1 +- Update to upstream 5.0 release. + +* Tue Nov 24 2009 Alexander Kurtakov 0:4.1-0.6 +- Use standard permissions and fix unowned directories. + +* Tue Nov 24 2009 Alexander Kurtakov 0:4.1-0.5 +- Fix rpmlint warnings. +- Drop gcj support. + +* Fri Jul 24 2009 Fedora Release Engineering - 0:4.1-0.4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:4.1-0.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Dec 03 2008 Matt Wringe - 0:4.1-0.2 +- Update to remove packaged jars in source tar +- Build with bootstrap jar so that required java source + files get generated + +* Wed Oct 22 2008 Jerry James - 0:4.1-0.1 +- Update to 4.1 +- Also ship the jjrun script +- Own the appropriate gcj directory +- Minor spec file changes to comply with latest Fedora guidelines +- Include the top-level index.html file in the manual + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:4.0-4.5 +- drop repotag + +* Fri Feb 22 2008 Matt Wringe - 0:4.0-4jpp.4 +- Rename javacc script file to javacc.sh as this confuses the makefile + +* Tue Feb 19 2008 Fedora Release Engineering - 0:4.0-4jpp.3 +- Autorebuild for GCC 4.3 + +* Thu Aug 10 2006 Matt Wringe - 0:4.0-3jpp.3 +- Rebuilt with new naming convention + +* Sat Jul 22 2006 Jakub Jelinek - 0:4.0-3jpp_2fc +- Rebuilt + +* Tue Jul 18 2006 Matthew Wringe - 0:4.0-3jpp_1fc +- Merged with upstream version +- Changed directory locations to rpm macros +- Added conditional native compiling + +* Thu Apr 20 2006 Fernando Nasser - 0:4.0-2jpp +- First JPP 1.7 build + +* Fri Mar 31 2006 Sebastiano Vigna - 0:4.0-1jpp +- Updated to 4.0 + +* Mon Aug 23 2004 Randy Watler - 0:3.2-2jpp +- Rebuild with ant-1.6.2 + +* Fri Jan 30 2004 Sebastiano Vigna 0:3.2-1jpp +- First JPackage version diff --git a/javacc.spec b/javacc.spec index 4b6bea8..8ebd6da 100644 --- a/javacc.spec +++ b/javacc.spec @@ -35,7 +35,7 @@ Name: javacc Version: 7.0.13 -Release: 7%{?dist} +Release: %autorelease Epoch: 0 Summary: A parser/scanner generator for java @@ -155,215 +155,4 @@ ln -s javacc %{buildroot}%{_bindir}/javacc.sh %doc examples %changelog -* Tue Jul 30 2024 Mikolaj Izdebski - 0:7.0.13-7 -- Adjust bootstrap build for javapackages-bootstrap update - -* Thu Jul 18 2024 Fedora Release Engineering - 0:7.0.13-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 0:7.0.13-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 0:7.0.13-4 -- bump of release for for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 0:7.0.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 0:7.0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Nov 17 2023 Jerry James - 0:7.0.13-1 -- Update to 7.0.13 -- Drop upstreamed duplicated @Deprecated annotations patch - -* Fri Sep 01 2023 Mikolaj Izdebski - 0:7.0.12-4 -- Rebuild - -* Sat Aug 26 2023 Mikolaj Izdebski - 0:7.0.12-3 -- Bootstrap using javapackages-bootstrap - -* Thu Jul 20 2023 Fedora Release Engineering - 0:7.0.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Apr 1 2023 Jerry James - 0:7.0.12-1 -- Update to 7.0.12 -- Convert License tag to SPDX -- Add bootstrap build mode -- Add patch to fix javadoc errors in the JavaCharStream template -- Add patch to remove duplicate @Deprecated annotations - -* Thu Jan 19 2023 Fedora Release Engineering - 0:7.0.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0:7.0.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 0:7.0.4-12 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 0:7.0.4-11 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 0:7.0.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0:7.0.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0:7.0.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0:7.0.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 20 2020 Mat Booth - 0:7.0.4-6 -- Force generation of 1.8 level bytecode to avoid breaking dependent packages - that require Java 8 - -* Fri Jul 10 2020 Jiri Vanek - 0:7.0.4-5 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering - 0:7.0.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0:7.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0:7.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Oct 26 2018 Marian Koncek - 0:7.0.4-1 -- Update to upstream version 7.0.4 -- Resolves: rhbz#1593262 - -* Tue Jul 31 2018 Severin Gehwolf - 0:7.0.2-6 -- Add requirement on javapackages-tools for scripts using - java-functions. - -* Fri Jul 13 2018 Fedora Release Engineering - 0:7.0.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0:7.0.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0:7.0.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0:7.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 16 2017 Michael Simacek - 0:7.0.2-1 -- Update to upstream version 7.0.2 - -* Mon Jan 02 2017 Michael Simacek - 0:7.0.1-1 -- Update to upstream version 7.0.1 - -* Tue Sep 06 2016 Michael Simacek - 0:6.1.3-1 -- Update to upstream version 6.1.3 -- Use new upstream location -- Generate scripts with jpackage_script - -* Tue Aug 23 2016 Michael Simacek - 0:6.1.2-1 -- Update to upstream version 6.1.2 - -* Thu Feb 04 2016 Fedora Release Engineering - 0:5.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0:5.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0:5.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Mikolaj Izdebski - 0:5.0-11 -- Use .mfiles generated during build - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0:5.0-10 -- Use Requires: java-headless rebuild (#1067528) - -* Tue Jul 30 2013 Michal Srb - 0:5.0-9 -- Generate javadoc -- Drop group tag - -* Thu Feb 14 2013 Fedora Release Engineering - 0:5.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 0:5.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jun 28 2012 Jaromir Capik 0:5.0-6 -- Fixing #835786 - javacc: Invalid upstream URL -- Minor spec file changes according to the latest guidelines - -* Fri Jan 13 2012 Fedora Release Engineering - 0:5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 0:5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jul 13 2010 Alexander Kurtakov 0:5.0-3 -- Fix examples line endings. - -* Fri Jun 4 2010 Alexander Kurtakov 0:5.0-2 -- Apply changes requested in review bug (rhbz#225940). - -* Thu Feb 11 2010 Alexander Kurtakov 0:5.0-1 -- Update to upstream 5.0 release. - -* Tue Nov 24 2009 Alexander Kurtakov 0:4.1-0.6 -- Use standard permissions and fix unowned directories. - -* Tue Nov 24 2009 Alexander Kurtakov 0:4.1-0.5 -- Fix rpmlint warnings. -- Drop gcj support. - -* Fri Jul 24 2009 Fedora Release Engineering - 0:4.1-0.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:4.1-0.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Dec 03 2008 Matt Wringe - 0:4.1-0.2 -- Update to remove packaged jars in source tar -- Build with bootstrap jar so that required java source - files get generated - -* Wed Oct 22 2008 Jerry James - 0:4.1-0.1 -- Update to 4.1 -- Also ship the jjrun script -- Own the appropriate gcj directory -- Minor spec file changes to comply with latest Fedora guidelines -- Include the top-level index.html file in the manual - -* Wed Jul 9 2008 Tom "spot" Callaway - 0:4.0-4.5 -- drop repotag - -* Fri Feb 22 2008 Matt Wringe - 0:4.0-4jpp.4 -- Rename javacc script file to javacc.sh as this confuses the makefile - -* Tue Feb 19 2008 Fedora Release Engineering - 0:4.0-4jpp.3 -- Autorebuild for GCC 4.3 - -* Thu Aug 10 2006 Matt Wringe - 0:4.0-3jpp.3 -- Rebuilt with new naming convention - -* Sat Jul 22 2006 Jakub Jelinek - 0:4.0-3jpp_2fc -- Rebuilt - -* Tue Jul 18 2006 Matthew Wringe - 0:4.0-3jpp_1fc -- Merged with upstream version -- Changed directory locations to rpm macros -- Added conditional native compiling - -* Thu Apr 20 2006 Fernando Nasser - 0:4.0-2jpp -- First JPP 1.7 build - -* Fri Mar 31 2006 Sebastiano Vigna - 0:4.0-1jpp -- Updated to 4.0 - -* Mon Aug 23 2004 Randy Watler - 0:3.2-2jpp -- Rebuild with ant-1.6.2 - -* Fri Jan 30 2004 Sebastiano Vigna 0:3.2-1jpp -- First JPackage version +%autochangelog From 45d8b3cc8496c7a045b23cb4508eddeb1e1c3a10 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 20 Nov 2024 11:38:01 -0700 Subject: [PATCH 21/32] Avoid unexpanded macro in package %description --- javacc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index 8ebd6da..c269ceb 100644 --- a/javacc.spec +++ b/javacc.spec @@ -94,7 +94,7 @@ Requires: %{name} = %{version}-%{release} %description demo Examples for %{name}. -%javadoc_package +%{?javadoc_package} %prep %autosetup -p1 -C From 5a0c90d9855dbe7a081c36646f2e8196cfceb12a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Nov 2024 07:50:11 +0100 Subject: [PATCH 22/32] Drop explicit requires on javapackages-tools --- javacc.spec | 4 ---- plans/javapackages.fmf | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/javacc.spec b/javacc.spec index c269ceb..739e94d 100644 --- a/javacc.spec +++ b/javacc.spec @@ -60,10 +60,6 @@ BuildRequires: ant BuildRequires: javacc %endif -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - BuildArch: noarch ExclusiveArch: %{java_arches} noarch 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 e86df2081fdee0c81af0f045c77b20233d03a5b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:42:46 +0000 Subject: [PATCH 23/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 19460bf8d7ff490c87def0c4a2971debcd62b211 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 5 Mar 2025 13:46:10 +0100 Subject: [PATCH 24/32] Drop explicit zero epoch --- javacc.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index 739e94d..ea67efa 100644 --- a/javacc.spec +++ b/javacc.spec @@ -36,7 +36,6 @@ Name: javacc Version: 7.0.13 Release: %autorelease -Epoch: 0 Summary: A parser/scanner generator for java # BSD-3-Clause: the project as a whole From caca8d054e8860969f2be431c5598d9724814a7f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 25/32] 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 b12a0e75fef236e5d161dad4845a40cd8191dd3a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 26/32] 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 2326bbb04d10227ae0a55f01d46e274a198a64d3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 10 Jul 2025 07:45:21 +0200 Subject: [PATCH 27/32] Update bootstrap JAR path - Build with OpenJDK 25 --- javacc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/javacc.spec b/javacc.spec index ea67efa..10c5721 100644 --- a/javacc.spec +++ b/javacc.spec @@ -54,7 +54,7 @@ Patch: 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: ant BuildRequires: javacc %endif @@ -113,7 +113,7 @@ fixtimestamp examples/JJTreeExamples/cpp/eg3.jjt %build %if %{with bootstrap} -cp %{_prefix}/lib/javapackages-bootstrap/javacc.jar bootstrap/javacc.jar +cp %{_datadir}/javapackages-bootstrap/javacc.jar bootstrap/javacc.jar %else build-jar-repository -p bootstrap javacc %endif From 68e1f5c45286ddbe8e9bfc467bd2033f7f612c49 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 21:25:43 +0200 Subject: [PATCH 28/32] Remove javadoc subpackage --- ...oc-errors-in-JavaCharStream.template.patch | 61 ------------------- javacc.spec | 11 ++-- 2 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch diff --git a/0001-Fix-javadoc-errors-in-JavaCharStream.template.patch b/0001-Fix-javadoc-errors-in-JavaCharStream.template.patch deleted file mode 100644 index a8f4d6a..0000000 --- a/0001-Fix-javadoc-errors-in-JavaCharStream.template.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 930afd9bf6d2a0324d806fd7ce2eeba7a223d2d1 Mon Sep 17 00:00:00 2001 -From: Jerry James -Date: Sat, 25 Mar 2023 15:17:02 -0600 -Subject: [PATCH] Fix javadoc errors in JavaCharStream.template - -Signed-off-by: Jerry James ---- - src/main/resources/templates/JavaCharStream.template | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/main/resources/templates/JavaCharStream.template b/src/main/resources/templates/JavaCharStream.template -index dc56b5b..07ee0de 100644 ---- a/src/main/resources/templates/JavaCharStream.template -+++ b/src/main/resources/templates/JavaCharStream.template -@@ -501,7 +501,6 @@ class JavaCharStream - - /** Constructor. - * @param dstream the underlying data source. -- * @param startline line number of the first character of the stream, mostly for error messages. - */ - public JavaCharStream(java.io.Reader dstream) - { -@@ -570,7 +569,7 @@ class JavaCharStream - * @param encoding the character encoding of the data stream. - * @param startline line number of the first character of the stream, mostly for error messages. - * @param startcolumn column number of the first character of the stream. -- * @throws UnsupportedEncodingException encoding is invalid or unsupported. -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public JavaCharStream(java.io.InputStream dstream, String encoding, int startline, - int startcolumn) throws java.io.UnsupportedEncodingException -@@ -592,7 +591,7 @@ class JavaCharStream - /** Constructor. - * @param dstream the underlying data source. - * @param encoding the character encoding of the data stream. -- * @throws UnsupportedEncodingException encoding is invalid or unsupported. -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException - { -@@ -636,7 +635,7 @@ class JavaCharStream - * @param encoding the character encoding of the data stream. - * @param startline line number of the first character of the stream, mostly for error messages. - * @param startcolumn column number of the first character of the stream. -- * @throws UnsupportedEncodingException encoding is invalid or unsupported. -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public void ReInit(java.io.InputStream dstream, String encoding, int startline, - int startcolumn) throws java.io.UnsupportedEncodingException -@@ -656,7 +655,7 @@ class JavaCharStream - /** Reinitialise. - * @param dstream the underlying data source. - * @param encoding the character encoding of the data stream. -- * @throws UnsupportedEncodingException encoding is invalid or unsupported. -+ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. - */ - public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException - { --- -2.39.2 - diff --git a/javacc.spec b/javacc.spec index 10c5721..be5ae72 100644 --- a/javacc.spec +++ b/javacc.spec @@ -47,9 +47,6 @@ License: BSD-3-Clause AND BSD-2-Clause URL: https://javacc.org/ VCS: git:%{giturl}.git Source: %{giturl}/archive/%{name}-%{version}.tar.gz -# Fix javadoc errors in the JavaCharStream template -# https://github.com/javacc/javacc/pull/257 -Patch: 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -78,6 +75,8 @@ a tool called JJTree included with JavaCC), actions, debugging, etc. # ISC: docs/grammars/JSONParser.jjt License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later AND (AFL-2.0 OR BSD-3-Clause) AND ISC Summary: Manual for %{name} +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 7.0.13-5 %description manual Manual for %{name}. @@ -89,8 +88,6 @@ Requires: %{name} = %{version}-%{release} %description demo Examples for %{name}. -%{?javadoc_package} - %prep %autosetup -p1 -C @@ -120,7 +117,7 @@ build-jar-repository -p bootstrap javacc # There is maven pom which doesn't really work for building. The tests don't # work either (even when using bundled jars). -%ant jar javadoc -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 +%ant jar -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 # The pom dependencies are also wrong %mvn_artifact --skip-dependencies pom.xml target/javacc.jar @@ -128,7 +125,7 @@ build-jar-repository -p bootstrap javacc %install %mvn_file : %{name} -%mvn_install -J target/javadoc +%mvn_install %jpackage_script javacc '' '' javacc javacc true ln -s javacc %{buildroot}%{_bindir}/javacc.sh From 9f1a6b49700f71db727c2d255dd7d0a645d4a3f6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 15 Jul 2025 06:50:16 -0600 Subject: [PATCH 29/32] Restore JavaCharStream.template patch This patch is not for producing javadocs from this package, but rather to generate code with correct javadoc comments. Its removal breaks other software that uses the JavaCharStream template. --- ...oc-errors-in-JavaCharStream.template.patch | 61 +++++++++++++++++++ javacc.spec | 3 + 2 files changed, 64 insertions(+) create mode 100644 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch diff --git a/0001-Fix-javadoc-errors-in-JavaCharStream.template.patch b/0001-Fix-javadoc-errors-in-JavaCharStream.template.patch new file mode 100644 index 0000000..a8f4d6a --- /dev/null +++ b/0001-Fix-javadoc-errors-in-JavaCharStream.template.patch @@ -0,0 +1,61 @@ +From 930afd9bf6d2a0324d806fd7ce2eeba7a223d2d1 Mon Sep 17 00:00:00 2001 +From: Jerry James +Date: Sat, 25 Mar 2023 15:17:02 -0600 +Subject: [PATCH] Fix javadoc errors in JavaCharStream.template + +Signed-off-by: Jerry James +--- + src/main/resources/templates/JavaCharStream.template | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/src/main/resources/templates/JavaCharStream.template b/src/main/resources/templates/JavaCharStream.template +index dc56b5b..07ee0de 100644 +--- a/src/main/resources/templates/JavaCharStream.template ++++ b/src/main/resources/templates/JavaCharStream.template +@@ -501,7 +501,6 @@ class JavaCharStream + + /** Constructor. + * @param dstream the underlying data source. +- * @param startline line number of the first character of the stream, mostly for error messages. + */ + public JavaCharStream(java.io.Reader dstream) + { +@@ -570,7 +569,7 @@ class JavaCharStream + * @param encoding the character encoding of the data stream. + * @param startline line number of the first character of the stream, mostly for error messages. + * @param startcolumn column number of the first character of the stream. +- * @throws UnsupportedEncodingException encoding is invalid or unsupported. ++ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. + */ + public JavaCharStream(java.io.InputStream dstream, String encoding, int startline, + int startcolumn) throws java.io.UnsupportedEncodingException +@@ -592,7 +591,7 @@ class JavaCharStream + /** Constructor. + * @param dstream the underlying data source. + * @param encoding the character encoding of the data stream. +- * @throws UnsupportedEncodingException encoding is invalid or unsupported. ++ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. + */ + public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException + { +@@ -636,7 +635,7 @@ class JavaCharStream + * @param encoding the character encoding of the data stream. + * @param startline line number of the first character of the stream, mostly for error messages. + * @param startcolumn column number of the first character of the stream. +- * @throws UnsupportedEncodingException encoding is invalid or unsupported. ++ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. + */ + public void ReInit(java.io.InputStream dstream, String encoding, int startline, + int startcolumn) throws java.io.UnsupportedEncodingException +@@ -656,7 +655,7 @@ class JavaCharStream + /** Reinitialise. + * @param dstream the underlying data source. + * @param encoding the character encoding of the data stream. +- * @throws UnsupportedEncodingException encoding is invalid or unsupported. ++ * @throws java.io.UnsupportedEncodingException encoding is invalid or unsupported. + */ + public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException + { +-- +2.39.2 + diff --git a/javacc.spec b/javacc.spec index be5ae72..86e541e 100644 --- a/javacc.spec +++ b/javacc.spec @@ -47,6 +47,9 @@ License: BSD-3-Clause AND BSD-2-Clause URL: https://javacc.org/ VCS: git:%{giturl}.git Source: %{giturl}/archive/%{name}-%{version}.tar.gz +# Fix javadoc errors in the JavaCharStream template +# https://github.com/javacc/javacc/pull/257 +Patch: 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 6ab834ef62888257f2855175c4eb47995844eaf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:56:15 +0000 Subject: [PATCH 30/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 1c43cccf0c21c9aa5e2d331a15a6e7d9ae40590b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 21:14:42 +0200 Subject: [PATCH 31/32] 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. --- javacc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javacc.spec b/javacc.spec index 86e541e..d50a68e 100644 --- a/javacc.spec +++ b/javacc.spec @@ -55,7 +55,7 @@ Patch: 0001-Fix-javadoc-errors-in-JavaCharStream.template.patch BuildRequires: javapackages-bootstrap %else BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: javacc %endif From b814a29efa12b4c62979d159449921e7c99b80e4 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 12:17:17 +0200 Subject: [PATCH 32/32] 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.