From c7fbe6360a2f9e5d7e34a1f9ffaad9cfed1d4925 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/10] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e882a35..9a29652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -738656753ed84fb25c9cbe29ab9f05fc java_cup-0.11b.tar.bz2 +SHA512 (java_cup-0.11b.tar.bz2) = b5528d1e7ca193331a5c431b86d273d840bee08d7a02453ac1c9a2c9890b2f2ab889dd63b3ae123d1185ea55601e2b045f8d743170dab0648eac50f9861ab8c8 From be82dc4c1f9f1b5c7b8bd1ed1f4b53a104fd49e4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 02/10] Expand conditionals --- java_cup.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index b01dfd5..4b2b5f4 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -22,9 +22,7 @@ Patch0: %{name}-build.patch BuildRequires: ant BuildRequires: javapackages-local BuildRequires: jflex -%if ! %{with_bootstrap} BuildRequires: java_cup >= 1:0.11a -%endif %description @@ -51,18 +49,14 @@ find -name "*.class" -delete %mvn_file ':{*}' @1 -%if ! %{with_bootstrap} # remove prebuilt JFlex rm -rf java_cup-%{version}/bin/JFlex.jar # remove prebuilt java_cup, if not bootstrapping rm -rf java_cup-%{version}/bin/java-cup-11.jar -%endif %build -%if ! %{with_bootstrap} export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) -%endif ant -Dcupversion=20150326 -Dsvnversion=65 find -name parser.cup -delete From bd27aa30a4df004fc5b7869c5675d8564c09d4c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:44 +0200 Subject: [PATCH 03/10] Mass rebuild for javapackages-tools 201901 --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index 4b2b5f4..67bfbca 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -84,6 +84,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1:0.11b-9 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1:0.11b-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 79de7f21dd0c0cc52bfaeaedf71ab599262ead37 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 4 Nov 2019 10:45:50 +0100 Subject: [PATCH 04/10] Use javac 1.6 --- java_cup.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/java_cup.spec b/java_cup.spec index 67bfbca..c8d8970 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -44,6 +44,8 @@ Documentation for java_cup. %setup -q %patch0 -b .build +sed -i '/ Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 05/10] Mass rebuild for javapackages-tools 201902 --- java_cup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index c8d8970..158e5e6 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -3,7 +3,7 @@ Name: java_cup Version: 0.11b -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 1 Summary: LALR parser generator for Java License: MIT @@ -86,6 +86,9 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %license licence.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1:0.11b-10 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1:0.11b-9 - Mass rebuild for javapackages-tools 201901 From a2bb6209f3f54ba2c283f2466690bed5a08faa66 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 17 Apr 2020 11:20:19 +0200 Subject: [PATCH 06/10] Add launcher script --- java_cup.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/java_cup.spec b/java_cup.spec index 158e5e6..f730c17 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -24,6 +24,10 @@ BuildRequires: javapackages-local BuildRequires: jflex BuildRequires: java_cup >= 1:0.11a +# Explicit javapackages-tools requires since scripts use +# /usr/share/java-utils/java-functions +Requires: javapackages-tools + %description java_cup is a LALR Parser Generator for Java @@ -74,7 +78,11 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4} %mvn_install -J dist/javadoc +# wrapper script for direct execution +%jpackage_script java_cup.Main "" "" java_cup cup true + %files -f .mfiles +%{_bindir}/cup %doc changelog.txt %license licence.txt From 9fbc75a69c1afb65c56c22e524d16641973fee9b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 May 2020 17:49:12 +0200 Subject: [PATCH 07/10] Drop version constraint on java_cup BR --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index f730c17..0fe51e0 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -22,7 +22,7 @@ Patch0: %{name}-build.patch BuildRequires: ant BuildRequires: javapackages-local BuildRequires: jflex -BuildRequires: java_cup >= 1:0.11a +BuildRequires: java_cup # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions From ca0f5d170c8529885ee9d01c8608ec0b864f167a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 08/10] Conditionalize buildrequires in bootstrap mode --- java_cup.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index 0fe51e0..af312aa 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,5 +1,6 @@ +%bcond_without bootstrap + %global pkg_version 11b -%global with_bootstrap 0 Name: java_cup Version: 0.11b @@ -19,10 +20,14 @@ Source4: %{name}-runtime-MANIFEST.MF Patch0: %{name}-build.patch -BuildRequires: ant BuildRequires: javapackages-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: ant BuildRequires: jflex BuildRequires: java_cup +%endif # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions From ee6e4219cd19babff751f389b443c25e0b1c97a7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 18:35:42 +0200 Subject: [PATCH 09/10] Use %ant macro --- java_cup.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java_cup.spec b/java_cup.spec index af312aa..ed65718 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -69,9 +69,9 @@ rm -rf java_cup-%{version}/bin/java-cup-11.jar %build export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex) -ant -Dcupversion=20150326 -Dsvnversion=65 +%ant -Dcupversion=20150326 -Dsvnversion=65 find -name parser.cup -delete -ant javadoc +%ant javadoc # inject OSGi manifests jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2} From ecfd775a3908e46ae6cc2c3c0922ffe8c0f344aa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 10/10] Turn off bootstrap mode by default --- java_cup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java_cup.spec b/java_cup.spec index ed65718..232be6c 100644 --- a/java_cup.spec +++ b/java_cup.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %global pkg_version 11b