diff --git a/.gitignore b/.gitignore index bfd0d32..daa0ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ java_cup_v10k.tar.gz java_cup-0.11a.tar.bz2 /java_cup-0.11b.tar.bz2 -/java_cup-0.11b.tar.zst diff --git a/0002-Set-Java-source-target-to-1.8.patch b/0002-Set-Java-source-target-to-1.8.patch new file mode 100644 index 0000000..b62e62e --- /dev/null +++ b/0002-Set-Java-source-target-to-1.8.patch @@ -0,0 +1,25 @@ +From 202fbfcbb7c179dcd40e7b296604febb10a8c256 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 21 Feb 2024 12:13:45 +0100 +Subject: [PATCH] Set Java source/target to 1.8 + +--- + build.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build.xml b/build.xml +index d5c2b54..cb1dfd1 100644 +--- a/build.xml ++++ b/build.xml +@@ -57,7 +57,7 @@ + token="+ version_str" + value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'> + +- ++ + + + +-- +2.43.0 + diff --git a/changelog b/changelog deleted file mode 100644 index 7e4d9d3..0000000 --- a/changelog +++ /dev/null @@ -1,240 +0,0 @@ -* Thu Jul 18 2024 Fedora Release Engineering - 1:0.11b-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Feb 29 2024 Jiri Vanek - 1:0.11b-30 -- bump of release for for java-21-openjdk as system jdk - -* Tue Feb 27 2024 Jiri Vanek - 1:0.11b-29 -- Rebuilt for java-21-openjdk as system jdk - -* Wed Feb 21 2024 Marian Koncek - 1:0.11b-28 -- Set OpenJDK version to 1.8 - -* Wed Jan 24 2024 Fedora Release Engineering - 1:0.11b-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1:0.11b-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 1:0.11b-25 -- Convert License tag to SPDX format - -* Thu Jul 20 2023 Fedora Release Engineering - 1:0.11b-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1:0.11b-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1:0.11b-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1:0.11b-21 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 1:0.11b-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 02 2021 Mikolaj Izdebski - 1:0.11b-19 -- Bump Java compiler source/target levels to 1.7 - -* Thu Jul 22 2021 Fedora Release Engineering - 1:0.11b-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1:0.11b-17 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1:0.11b-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1:0.11b-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1:0.11b-14 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Thu Jun 25 2020 Roland Grunberg - 1:0.11b-13 -- Use source/target of 1.6 to build against Java 11. - -* Wed Jan 29 2020 Fedora Release Engineering - 1:0.11b-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 1:0.11b-10 -- Mass rebuild for javapackages-tools 201902 - -* Thu Jul 25 2019 Fedora Release Engineering - 1:0.11b-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1:0.11b-9 -- Mass rebuild for javapackages-tools 201901 - -* Fri Feb 01 2019 Fedora Release Engineering - 1:0.11b-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1:0.11b-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1:0.11b-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Sep 25 2017 Mikolaj Izdebski - 1:0.11b-7 -- Elimitate race condition when injecting JAR manifest -- Resolves: rhbz#1495233 - -* Wed Jul 26 2017 Fedora Release Engineering - 1:0.11b-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 22 2017 Michael Simacek - 1:0.11b-5 -- Install with XMvn - -* Fri Feb 10 2017 Fedora Release Engineering - 1:0.11b-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1:0.11b-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Dec 24 2015 gil cattaneo 1:0.11b-2 -- convert %%defines to %%global - -* Tue Jun 23 2015 Mikolaj Izdebski - 1:0.11b-1 -- Update to upstream version 0.11b - -* Wed Jun 17 2015 Fedora Release Engineering - 1:0.11a-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 06 2015 gil cattaneo 1:0.11a-19 -- introduce license macro - -* Sat Jun 07 2014 Fedora Release Engineering - 1:0.11a-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Mikolaj Izdebski - 1:0.11a-17 -- Use .mfiles generated during build - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1:0.11a-16 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 31 2013 Mat Booth - 1:0.11a-15 -- Inject OSGi manifests into both jars. - -* Fri Aug 30 2013 Mat Booth - 1:0.11a-14 -- Patch so that generated action methods do not exceed the 65535 byte JVM - method size limit. Supplied by eclipse-pdt project. -- Drop rpm bug workaround scriptlet. - -* Sat Aug 03 2013 Fedora Release Engineering - 1:0.11a-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 1:0.11a-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Nov 13 2012 gil cattaneo 1:0.11a-11 -- adapt to current guideline -- add %%pre javadoc script - -* Tue Nov 13 2012 Tom Callaway - 1:0.11a-10 -- include copy of LICENSE, correct License tag - -* Thu Jul 19 2012 Fedora Release Engineering - 1:0.11a-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jun 24 2012 Gerard Ryan - 1:0.11a-8 -- Inject OSGI Manifest for java-cup-runtime.jar - -* Fri Jan 13 2012 Fedora Release Engineering - 1:0.11a-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 1:0.11a-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Dec 04 2010 Lubomir Rintel 1:0.11a-5 -- Require appropriate packages for depmap maintenance in scriptlets -- Remove classpath from jar manifest - -* Mon Feb 15 2010 Alexander Kurtakov 1:0.11a-4 -- Add maven pom and depmap. - -* Wed Jan 20 2010 Alexander Kurtakov 1:0.11a-3 -- Fix bootstrap. - -* Sun Jan 17 2010 Miloš Jakubíček - 1:0.11a-2 -- Rebuilt in non-bootstrap mode (removed all prebuilt jars). -- Added BR: jflex and java_cup >= 1:0.11a for non-bootstrap mode -- Remove unnecessary R(post,postun): coreutils - -* Fri Jan 8 2010 Alexander Kurtakov 1:0.11a-1 -- Update to 0.11a. -- Drop gcj_support. - -* Fri Jul 24 2009 Fedora Release Engineering - 1:0.10k-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1:0.10k-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jul 15 2008 Lubomir Rintel - 1:0.10k-1 -- Fix the version to match upstream, so that FEver can be used - -* Wed Jul 9 2008 Tom "spot" Callaway - 1:0.10-0.k.6.3 -- drop repotag - -* Sun Feb 17 2008 Lubomir Kundrak - 1:0.10-0.k.6jpp.2 -- Ant task -- Clean up to satisfy QA script and rpmlint - -* Fri Aug 04 2006 Vivek Lakshmanan - 1:0.10-0.k.6jpp.1 -- Re-sync with latest version from JPP. -- Partially adopt new naming convention. - -* Sat Jul 22 2006 Jakub Jelinek - 1:0.10-0.k.5jpp_2fc -- Rebuilt - -* Thu Jul 20 2006 Vivek Lakshmanan - 1:0.10-0.k.5jpp_1fc -- Re-sync with latest version from JPP. - -* Wed Jul 19 2006 Vivek Lakshmanan - 1:0.10-0.k.4jpp_1fc -- Conditional native compilation for GCJ. - -* Wed Jul 12 2006 Jesse Keating - 1:0.10-0.k.1jpp_10fc -- rebuild - -* Mon Mar 6 2006 Jeremy Katz - 1:0.10-0.k.1jpp_9fc -- stop scriptlet spew - -* Fri Feb 10 2006 Jesse Keating - 1:0.10-0.k.1jpp_8fc -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating - 1:0.10-0.k.1jpp_7fc -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 3 2006 Jesse Keating 1:0.10-0.k.1jpp_6fc -- rebuilt again - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Tue Jul 19 2005 Gary Benson 1:0.10-0.k.1jpp_5fc -- Build on ia64, ppc64, s390 and s390x. -- Switch to aot-compile-rpm. - -* Tue Jun 28 2005 Gary Benson 1:0.10-0.k.1jpp_4fc -- BC-compile. - -* Tue Jun 21 2005 Gary Benson 1:0.10-0.k.1jpp_3fc -- Remove classes from the tarball. - -* Thu Nov 4 2004 Gary Benson 1:0.10-0.k.1jpp_2fc -- Build into Fedora. - -* Thu Mar 4 2004 Frank Ch. Eigler 1:0.10-0.k.1jpp_1rh -- RH vacuuming - -* Thu Jan 22 2004 David Walluck 1:0.10-0.k.1jpp -- fix version/release (bump epoch) -- change License tag from Free to BSD-style -- add Distribution tag -- really update for JPackage 1.5 - -* Wed Mar 26 2003 Paul Nasrat 0.10k-1jpp -- for jpackage-utils 1.5 -- New spec reverse engineered from binary rpms diff --git a/0001-Adopt-build-script.patch b/java_cup-build.patch similarity index 51% rename from 0001-Adopt-build-script.patch rename to java_cup-build.patch index 4d476d5..4fcfdbd 100644 --- a/0001-Adopt-build-script.patch +++ b/java_cup-build.patch @@ -1,16 +1,5 @@ -From d58d0d2cb2626b15077eaf902f16f7a6bca41933 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 16 Jul 2025 18:15:17 +0200 -Subject: [PATCH] Adopt build script - ---- - build.xml | 16 +--------------- - 1 file changed, 1 insertion(+), 15 deletions(-) - -diff --git a/build.xml b/build.xml -index 33f0c60..975e753 100644 ---- a/build.xml -+++ b/build.xml +--- build.xml~ 2014-06-12 17:23:24.000000000 +0200 ++++ build.xml 2015-06-23 10:30:57.374976304 +0200 @@ -17,18 +17,6 @@ @@ -30,17 +19,7 @@ index 33f0c60..975e753 100644 -@@ -69,8 +57,7 @@ - token="+ version_str" - value='+ "v0.11b ${cupversion} (SVN rev ${svnversion})"'> - -- -- -+ - - - -@@ -78,7 +65,6 @@ +@@ -78,7 +66,6 @@ @@ -48,6 +27,14 @@ index 33f0c60..975e753 100644 --- -2.50.1 - +@@ -143,4 +130,10 @@ + + + ++ ++ ++ ++ ++ ++ + diff --git a/java_cup.spec b/java_cup.spec index 9e974d1..462eae4 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,39 +1,50 @@ %bcond_with bootstrap -%global pkg_version 11b + +%global pkg_version 11b Name: java_cup -Epoch: 1 Version: 0.11b -Release: %autorelease +Release: 29%{?dist} +Epoch: 1 Summary: LALR parser generator for Java License: SMLNJ -URL: https://www2.cs.tum.edu/projects/cup/ +URL: http://www2.cs.tum.edu/projects/cup/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch -# git clone https://github.com/DrMichaelPetter/cup.git -# git -C cup archive --prefix java_cup-0.11b/ c35ed3ab0cde2310af9b01321c930349c7c797e2 | zstd -15 >java_cup-0.11b.tar.zst -Source0: java_cup-%{version}.tar.zst +# svn export -r 65 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11b +# tar cjf java_cup-0.11b.tar.bz2 java_cup-0.11b/ +Source0: java_cup-%{version}.tar.bz2 # Add OSGi manifests Source2: %{name}-MANIFEST.MF Source4: %{name}-runtime-MANIFEST.MF -Patch: 0001-Adopt-build-script.patch +Patch0: %{name}-build.patch +Patch1: 0002-Set-Java-source-target-to-1.8.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant-openjdk25 -BuildRequires: java_cup +BuildRequires: javapackages-local +BuildRequires: ant BuildRequires: jflex +BuildRequires: java_cup %endif -# TODO Remove in Fedora 46 -Obsoletes: %{name}-javadoc < 1:0.11b-57 + +# Explicit javapackages-tools requires since scripts use +# /usr/share/java-utils/java-functions +Requires: javapackages-tools + %description java_cup is a LALR Parser Generator for Java +%package javadoc +Summary: Javadoc for java_cup + +%description javadoc +Javadoc for java_cup + %package manual Summary: Documentation for java_cup @@ -41,7 +52,9 @@ Summary: Documentation for java_cup Documentation for java_cup. %prep -%autosetup -p1 -C +%setup -q +%patch 0 -b .build +%patch 1 -p1 # remove all binary files find -name "*.class" -delete @@ -58,16 +71,18 @@ rm -rf java_cup-%{version}/bin/java-cup-11.jar export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) %ant -Dcupversion=20150326 -Dsvnversion=65 +find -name parser.cup -delete +%ant javadoc # inject OSGi manifests -%jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2} -%jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} +jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2} +jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %install %mvn_artifact %{name}:%{name}:%{version} dist/java-cup-%{pkg_version}.jar %mvn_artifact %{name}:%{name}-runtime:%{version} dist/java-cup-%{pkg_version}-runtime.jar -%mvn_install +%mvn_install -J dist/javadoc # wrapper script for direct execution %jpackage_script java_cup.Main "" "" java_cup cup true @@ -81,5 +96,241 @@ export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) %doc manual.html %license licence.txt +%files javadoc -f .mfiles-javadoc +%license licence.txt + %changelog -%autochangelog +* Sat Mar 02 2024 Jiri Vanek - 1:0.11b-29 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Feb 21 2024 Marian Koncek - 1:0.11b-28 +- Set OpenJDK version to 1.8 + +* Wed Jan 24 2024 Fedora Release Engineering - 1:0.11b-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1:0.11b-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1:0.11b-25 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 1:0.11b-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1:0.11b-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1:0.11b-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1:0.11b-21 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1:0.11b-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1:0.11b-19 +- Bump Java compiler source/target levels to 1.7 + +* Thu Jul 22 2021 Fedora Release Engineering - 1:0.11b-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1:0.11b-17 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1:0.11b-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1:0.11b-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1:0.11b-14 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 25 2020 Roland Grunberg - 1:0.11b-13 +- Use source/target of 1.6 to build against Java 11. + +* Wed Jan 29 2020 Fedora Release Engineering - 1:0.11b-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1:0.11b-10 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 1:0.11b-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1:0.11b-9 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 1:0.11b-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1:0.11b-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1:0.11b-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Sep 25 2017 Mikolaj Izdebski - 1:0.11b-7 +- Elimitate race condition when injecting JAR manifest +- Resolves: rhbz#1495233 + +* Wed Jul 26 2017 Fedora Release Engineering - 1:0.11b-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 22 2017 Michael Simacek - 1:0.11b-5 +- Install with XMvn + +* Fri Feb 10 2017 Fedora Release Engineering - 1:0.11b-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1:0.11b-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Dec 24 2015 gil cattaneo 1:0.11b-2 +- convert %%defines to %%global + +* Tue Jun 23 2015 Mikolaj Izdebski - 1:0.11b-1 +- Update to upstream version 0.11b + +* Wed Jun 17 2015 Fedora Release Engineering - 1:0.11a-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Feb 06 2015 gil cattaneo 1:0.11a-19 +- introduce license macro + +* Sat Jun 07 2014 Fedora Release Engineering - 1:0.11a-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Mikolaj Izdebski - 1:0.11a-17 +- Use .mfiles generated during build + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1:0.11a-16 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 31 2013 Mat Booth - 1:0.11a-15 +- Inject OSGi manifests into both jars. + +* Fri Aug 30 2013 Mat Booth - 1:0.11a-14 +- Patch so that generated action methods do not exceed the 65535 byte JVM + method size limit. Supplied by eclipse-pdt project. +- Drop rpm bug workaround scriptlet. + +* Sat Aug 03 2013 Fedora Release Engineering - 1:0.11a-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 1:0.11a-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 13 2012 gil cattaneo 1:0.11a-11 +- adapt to current guideline +- add %%pre javadoc script + +* Tue Nov 13 2012 Tom Callaway - 1:0.11a-10 +- include copy of LICENSE, correct License tag + +* Thu Jul 19 2012 Fedora Release Engineering - 1:0.11a-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jun 24 2012 Gerard Ryan - 1:0.11a-8 +- Inject OSGI Manifest for java-cup-runtime.jar + +* Fri Jan 13 2012 Fedora Release Engineering - 1:0.11a-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 1:0.11a-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Dec 04 2010 Lubomir Rintel 1:0.11a-5 +- Require appropriate packages for depmap maintenance in scriptlets +- Remove classpath from jar manifest + +* Mon Feb 15 2010 Alexander Kurtakov 1:0.11a-4 +- Add maven pom and depmap. + +* Wed Jan 20 2010 Alexander Kurtakov 1:0.11a-3 +- Fix bootstrap. + +* Sun Jan 17 2010 Miloš Jakubíček - 1:0.11a-2 +- Rebuilt in non-bootstrap mode (removed all prebuilt jars). +- Added BR: jflex and java_cup >= 1:0.11a for non-bootstrap mode +- Remove unnecessary R(post,postun): coreutils + +* Fri Jan 8 2010 Alexander Kurtakov 1:0.11a-1 +- Update to 0.11a. +- Drop gcj_support. + +* Fri Jul 24 2009 Fedora Release Engineering - 1:0.10k-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1:0.10k-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jul 15 2008 Lubomir Rintel - 1:0.10k-1 +- Fix the version to match upstream, so that FEver can be used + +* Wed Jul 9 2008 Tom "spot" Callaway - 1:0.10-0.k.6.3 +- drop repotag + +* Sun Feb 17 2008 Lubomir Kundrak - 1:0.10-0.k.6jpp.2 +- Ant task +- Clean up to satisfy QA script and rpmlint + +* Fri Aug 04 2006 Vivek Lakshmanan - 1:0.10-0.k.6jpp.1 +- Re-sync with latest version from JPP. +- Partially adopt new naming convention. + +* Sat Jul 22 2006 Jakub Jelinek - 1:0.10-0.k.5jpp_2fc +- Rebuilt + +* Thu Jul 20 2006 Vivek Lakshmanan - 1:0.10-0.k.5jpp_1fc +- Re-sync with latest version from JPP. + +* Wed Jul 19 2006 Vivek Lakshmanan - 1:0.10-0.k.4jpp_1fc +- Conditional native compilation for GCJ. + +* Wed Jul 12 2006 Jesse Keating - 1:0.10-0.k.1jpp_10fc +- rebuild + +* Mon Mar 6 2006 Jeremy Katz - 1:0.10-0.k.1jpp_9fc +- stop scriptlet spew + +* Fri Feb 10 2006 Jesse Keating - 1:0.10-0.k.1jpp_8fc +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1:0.10-0.k.1jpp_7fc +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Tue Jan 3 2006 Jesse Keating 1:0.10-0.k.1jpp_6fc +- rebuilt again + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Jul 19 2005 Gary Benson 1:0.10-0.k.1jpp_5fc +- Build on ia64, ppc64, s390 and s390x. +- Switch to aot-compile-rpm. + +* Tue Jun 28 2005 Gary Benson 1:0.10-0.k.1jpp_4fc +- BC-compile. + +* Tue Jun 21 2005 Gary Benson 1:0.10-0.k.1jpp_3fc +- Remove classes from the tarball. + +* Thu Nov 4 2004 Gary Benson 1:0.10-0.k.1jpp_2fc +- Build into Fedora. + +* Thu Mar 4 2004 Frank Ch. Eigler 1:0.10-0.k.1jpp_1rh +- RH vacuuming + +* Thu Jan 22 2004 David Walluck 1:0.10-0.k.1jpp +- fix version/release (bump epoch) +- change License tag from Free to BSD-style +- add Distribution tag +- really update for JPackage 1.5 + +* Wed Mar 26 2003 Paul Nasrat 0.10k-1jpp +- for jpackage-utils 1.5 +- New spec reverse engineered from binary rpms diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index ae17c0c..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 + url: https://src.fedoraproject.org/tests/javapackages + ref: f40 execute: how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf index a1e7bfd..6faab89 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,5 +1,9 @@ summary: Basic smoke test discover: - how: fmf + how: shell + tests: + - name: /smoke/empty-grammar + test: | + echo 'non terminal bar; bar::=;' | cup execute: how: tmt diff --git a/sources b/sources index 3bdd25b..9a29652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (java_cup-0.11b.tar.zst) = f999ed5c20c35eb2f86aa5b1720f9f38b2c0729edddfbbabe81779d7221b6d3253b92e1b86d4055d2b9da61b644d2196c3d41b025de455ca67c5448d3f02d233 +SHA512 (java_cup-0.11b.tar.bz2) = b5528d1e7ca193331a5c431b86d273d840bee08d7a02453ac1c9a2c9890b2f2ab889dd63b3ae123d1185ea55601e2b045f8d743170dab0648eac50f9861ab8c8 diff --git a/tests/Sanity/smoke/empty.cup b/tests/Sanity/smoke/empty.cup deleted file mode 100644 index 479f98e..0000000 --- a/tests/Sanity/smoke/empty.cup +++ /dev/null @@ -1,2 +0,0 @@ -non terminal bar; -bar::=; diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf deleted file mode 100644 index b9bed52..0000000 --- a/tests/Sanity/smoke/main.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: java_cup smoke test -description: | - Test basic functionality of java_cup. -require: - - java_cup - - java-21-openjdk-devel diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh deleted file mode 100755 index 838cfcd..0000000 --- a/tests/Sanity/smoke/runtest.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# Author: Mikolaj Izdebski -. /usr/share/beakerlib/beakerlib.sh - -rlJournalStart - - rlPhaseStartTest "check for presence of cup command" - rlAssertRpm java_cup - rlAssertBinaryOrigin cup java_cup - rlPhaseEnd - - rlPhaseStartTest "display cup version" - rlRun -s "cup -version" 1 - rlAssertGrep "CUP v0" $rlRun_LOG - rlPhaseEnd - - rlPhaseStartTest "generate parser for empty grammar" - java_home=/usr/lib/jvm/java-21-openjdk/bin - jar=/usr/share/java/java_cup-runtime.jar - rlRun -s "cup empty.cup" - rlAssertGrep "0 errors and 0 warnings" $rlRun_LOG - rlAssertGrep "2 terminals, 1 non-terminal, and 2 productions declared" $rlRun_LOG - rlAssertGrep "Code written to" $rlRun_LOG - rlRun "javac -cp ${jar} parser.java sym.java" - rlPhaseEnd - -rlJournalEnd -rlJournalPrintText diff --git a/tests/main.fmf b/tests/main.fmf deleted file mode 100644 index 99fd67e..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,4 +0,0 @@ -contact: Mikolaj Izdebski -framework: beakerlib -test: ./runtest.sh -tier: 0