diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 1e12c11..622be3a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,3 @@ javacc-5.0src.tar.gz /7.0.1.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/0001-Add-javadoc-target-to-build.xml.patch b/0001-Add-javadoc-target-to-build.xml.patch new file mode 100644 index 0000000..2132410 --- /dev/null +++ b/0001-Add-javadoc-target-to-build.xml.patch @@ -0,0 +1,25 @@ +From 8f1dda63b3e44835a0a88975b368c132f538fd4f Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Tue, 30 Jul 2013 15:10:14 +0200 +Subject: [PATCH] Add javadoc target to build.xml + +--- + build.xml | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/build.xml b/build.xml +index 7337939..0b283c5 100644 +--- a/build.xml ++++ b/build.xml +@@ -538,4 +538,8 @@ THE POSSIBILITY OF SUCH DAMAGE. + + + ++ ++ ++ ++ + +-- +1.8.1.4 + 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/changelog b/changelog deleted file mode 100644 index 9d8f6f0..0000000 --- a/changelog +++ /dev/null @@ -1,212 +0,0 @@ -* 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/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 7b6e38f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- !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/javacc.spec b/javacc.spec index d50a68e..3c4e8f7 100644 --- a/javacc.spec +++ b/javacc.spec @@ -28,36 +28,21 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Build in bootstrap mode on new architectures -%bcond bootstrap 0 - -%global giturl https://github.com/javacc/javacc - Name: javacc -Version: 7.0.13 -Release: %autorelease +Version: 7.0.4 +Release: 13%{?dist} +Epoch: 0 Summary: A parser/scanner generator for java +License: BSD +URL: http://javacc.org +Source0: https://github.com/javacc/javacc/archive/%{version}.tar.gz -# BSD-3-Clause: the project as a whole -# BSD-2-Clause: -# - src/main/javacc/ConditionParser.jj -# - src/main/java/org/javacc/parser/OutputFile.java -# - src/main/java/org/javacc/utils/OutputFileGenerator.java -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 -%else -BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant-openjdk25 +BuildRequires: javapackages-local +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 @@ -71,15 +56,7 @@ standard capabilities related to parser generation such as tree building (via a tool called JJTree included with JavaCC), actions, debugging, etc. %package manual -# BSD-3-Clause: the project license -# GPL-2.0-or-later: docs/grammars/AsnParser.jj -# LGPL-2.1-or-later: docs/grammars/{ChemNumber.jj,RTFParser.jj} -# AFL-2.0 OR BSD-3-Clause: docs/grammars/EcmaScript.jjt -# 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}. @@ -91,63 +68,227 @@ Requires: %{name} = %{version}-%{release} %description demo Examples for %{name}. +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains the API documentation for %{name}. + %prep -%autosetup -p1 -C +%setup -q -n %{name}-%{version} # Remove binary information in the source tar find . -name "*.jar" -delete -find examples -name .gitignore -delete +find . -name "*.class" -delete -fixtimestamp() { - touch -r $1.orig $1 - rm $1.orig -} - -mv examples/JJTreeExamples/cpp/README examples/JJTreeExamples/cpp/README.orig -iconv -f WINDOWS-1252 -t UTF-8 examples/JJTreeExamples/cpp/README.orig > \ - examples/JJTreeExamples/cpp/README -fixtimestamp examples/JJTreeExamples/cpp/README - -sed -i.orig 's/\r//' examples/JJTreeExamples/cpp/eg3.jjt -fixtimestamp examples/JJTreeExamples/cpp/eg3.jjt +find ./examples -type f -exec sed -i 's/\r//' {} \; %build -%if %{with bootstrap} -cp %{_datadir}/javapackages-bootstrap/javacc.jar 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 -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 +%mvn_artifact --skip-dependencies pom.xml target/javacc-%{version}.jar %install %mvn_file : %{name} -%mvn_install +%mvn_install -J target/javadoc %jpackage_script javacc '' '' javacc javacc true -ln -s javacc %{buildroot}%{_bindir}/javacc.sh +ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh %jpackage_script jjdoc '' '' javacc jjdoc true %jpackage_script jjtree '' '' javacc jjtree true %files -f .mfiles %license LICENSE -%doc README.md +%doc README %{_bindir}/javacc %{_bindir}/javacc.sh %{_bindir}/jjdoc %{_bindir}/jjtree %files manual -%doc docs/* +%doc www/* %files demo %doc examples +%files javadoc -f .mfiles-javadoc +%license LICENSE + %changelog -%autochangelog +* 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/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 -execute: - how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf deleted file mode 100644 index a1e7bfd..0000000 --- a/plans/smoke.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index e225488..c6e7d4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (javacc-7.0.13.tar.gz) = ed71e47fc4a382c9c53067bbf73bd9736ee0c41d65e328d5e4843cd71c88d3b7715d7a8fe38f10152ef7ef3be064abf9e801c6ea78066c4fcbabf124dfc4e144 +SHA512 (7.0.4.tar.gz) = b93c93e8490aae9a26b0de948896ec6d7a044c205d09584c3908988e24a3ea63a1147365115b17a15c6fb311c44f53ddff7c11f092731cbd05d3ec1950ef57f1 diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf deleted file mode 100644 index 0b1dc14..0000000 --- a/tests/Sanity/smoke/main.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: javacc smoke test -description: | - Test basic functionality of javacc. -require: - - javacc - - java-devel diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh deleted file mode 100755 index 2dec9db..0000000 --- a/tests/Sanity/smoke/runtest.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/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 deleted file mode 100644 index 22977d7..0000000 --- a/tests/Sanity/smoke/smoke.jj +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 9e2ea10..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,4 +0,0 @@ -contact: Mikolaj Izdebski -framework: beakerlib -test: ./runtest.sh -tier: 1