From 2bfd7db662fa936fd411d39ec3e53d2156e5900c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/11] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index c4792a8..9029c72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90af12c08afe8aef549df5770785a917 jflex-1.6.1-clean.tar.gz +SHA512 (jflex-1.6.1-clean.tar.gz) = 65668407d0a06a59360baeebe5c97274927e3601f7ebc4dc4a6c806af7cfa3c6f746fb05d3fae7f415a79db8e892cb412b8d76abbba2cfc75cc63b158a39a9f8 From 98810bb8057734f81c11a5a4132d3d4c845bca6f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 02/11] Expand conditionals --- jflex.spec | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/jflex.spec b/jflex.spec index a812393..119a24f 100644 --- a/jflex.spec +++ b/jflex.spec @@ -1,5 +1,3 @@ -%bcond_without desktop -%bcond_without emacs Summary: Fast Scanner Generator Name: jflex @@ -23,13 +21,6 @@ BuildRequires: junit BuildRequires: sonatype-oss-parent BuildRequires: java-devel BuildRequires: java_cup -%if %{with desktop} -BuildRequires: desktop-file-utils -%endif -%if %{with emacs} -BuildRequires: emacs -Requires: emacs-filesystem >= %{_emacs_version} -%endif # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -68,10 +59,6 @@ java -jar $(find-jar java_cup) -parser LexParse -interface -destdir src/main/jav jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex %mvn_build -%if %{with emacs} -# Compile Emacs jflex-mode source -%{_emacs_bytecompile} lib/jflex-mode.el -%endif %install %mvn_install @@ -84,31 +71,14 @@ install -d -m 755 %{buildroot}%{_mandir}/man1 install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1 # .desktop + icons -%if %{with desktop} -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} -install -d -m 755 %{buildroot}%{_datadir}/pixmaps -install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png -%endif # Emacs files -%if %{with emacs} -install -d -m 755 %{buildroot}%{_emacs_sitelispdir}/%{name} -install -p -m 644 lib/jflex-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name} -install -p -m 644 lib/jflex-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name} -%endif %files -f .mfiles %doc doc %doc COPYRIGHT %{_bindir}/%{name} %{_mandir}/man1/%{name}.1.gz -%if %{with desktop} -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png -%endif -%if %{with emacs} -%{_emacs_sitelispdir}/%{name} -%endif %files javadoc %doc COPYRIGHT From 2c00752484defe211ab0d43525b2a8dfe7d90a08 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:50 +0200 Subject: [PATCH 03/11] Mass rebuild for javapackages-tools 201901 --- jflex.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jflex.spec b/jflex.spec index 119a24f..26d4d5c 100644 --- a/jflex.spec +++ b/jflex.spec @@ -2,7 +2,7 @@ Summary: Fast Scanner Generator Name: jflex Version: 1.6.1 -Release: 12%{?dist} +Release: 13%{?dist} License: BSD URL: http://jflex.de/ BuildArch: noarch @@ -86,6 +86,9 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1 %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.6.1-13 +- Mass rebuild for javapackages-tools 201901 + * Tue Jul 31 2018 Severin Gehwolf - 1.6.1-12 - Add requirement on javapackages-tools for scripts using java-functions. From de9eb2ac0d36a1b575934c51259b66bac4315543 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 6 Jun 2019 15:03:07 +0200 Subject: [PATCH 04/11] Update to upstream version 1.7.0 --- .gitignore | 1 + create-tarball.sh | 2 +- jflex.spec | 22 ++++++++++++++++++---- sources | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f390030..2753249 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ jflex-1.4.3.tar.gz /jflex-1.5.1-clean.tar.gz /jflex-1.6.0-clean.tar.gz /jflex-1.6.1-clean.tar.gz +/jflex-1.7.0-clean.tar.gz diff --git a/create-tarball.sh b/create-tarball.sh index 849de41..90501c5 100755 --- a/create-tarball.sh +++ b/create-tarball.sh @@ -8,7 +8,7 @@ fi VERSION=${1} NAME="jflex" -wget http://jflex.de/${NAME}-${VERSION}.tar.gz +wget http://jflex.de/release/${NAME}-${VERSION}.tar.gz tar xvf ${NAME}-${VERSION}.tar.gz ( diff --git a/jflex.spec b/jflex.spec index 26d4d5c..c95817a 100644 --- a/jflex.spec +++ b/jflex.spec @@ -1,8 +1,7 @@ - Summary: Fast Scanner Generator Name: jflex -Version: 1.6.1 -Release: 13%{?dist} +Version: 1.7.0 +Release: 1%{?dist} License: BSD URL: http://jflex.de/ BuildArch: noarch @@ -47,13 +46,25 @@ This package provides %{summary}. %mvn_file : %{name} %pom_add_dep java_cup:java_cup -%pom_remove_plugin :maven-antrun-plugin %pom_remove_plugin :jflex-maven-plugin +%pom_remove_plugin :cup-maven-plugin +%pom_remove_plugin :maven-shade-plugin +%pom_remove_dep :cup_runtime # Tests fail with 320k stacks (default on i686), so lets increase # stack to 16M to avoid stack overflows. See rhbz#1119308 %pom_xpath_inject "pom:plugin[pom:artifactId='maven-surefire-plugin']/pom:configuration" "-Xss16384k" +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-site-plugin']" parent.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='fmt-maven-plugin']" parent.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='cup-maven-plugin']" parent.xml +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-shade-plugin']" parent.xml + +%pom_xpath_remove "pom:dependency[pom:artifactId='plexus-compiler-javac-errorprone']" parent.xml +%pom_xpath_remove "pom:dependency[pom:artifactId='error_prone_core']" parent.xml +%pom_xpath_remove "pom:compilerId" parent.xml +%pom_xpath_remove "pom:compilerArgs" parent.xml + %build java -jar $(find-jar java_cup) -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex @@ -86,6 +97,9 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1 %changelog +* Thu Jun 06 2019 Marian Koncek - 1.7.0-1 +- Update to upstream version 1.7.0 + * Fri May 24 2019 Mikolaj Izdebski - 1.6.1-13 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 9029c72..609f822 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jflex-1.6.1-clean.tar.gz) = 65668407d0a06a59360baeebe5c97274927e3601f7ebc4dc4a6c806af7cfa3c6f746fb05d3fae7f415a79db8e892cb412b8d76abbba2cfc75cc63b158a39a9f8 +SHA512 (jflex-1.7.0-clean.tar.gz) = 4040808a543133beb1ef9243eadc1d7eb137660e6bcc3ab462fbb0799eca6c655da6ecc4e17998380b7c4abc167a361f05f45c3fb8de112f6311e232602efd09 From 37f1ea9412ce319fc04e5edf7ca6443438e63121 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 7 Jun 2019 09:44:48 +0200 Subject: [PATCH 05/11] Don't use deprecated inputstreamctor option --- jflex.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jflex.spec b/jflex.spec index c95817a..0f46abc 100644 --- a/jflex.spec +++ b/jflex.spec @@ -65,6 +65,8 @@ This package provides %{summary}. %pom_xpath_remove "pom:compilerId" parent.xml %pom_xpath_remove "pom:compilerArgs" parent.xml +sed -i /%%inputstreamctor/d src/main/jflex/LexScan.flex + %build java -jar $(find-jar java_cup) -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex From 0f7ff11c7abceffcf50f9f645e828542191997e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 06/11] Mass rebuild for javapackages-tools 201902 --- jflex.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jflex.spec b/jflex.spec index 0f46abc..61da111 100644 --- a/jflex.spec +++ b/jflex.spec @@ -1,7 +1,7 @@ Summary: Fast Scanner Generator Name: jflex Version: 1.7.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://jflex.de/ BuildArch: noarch @@ -99,6 +99,9 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1 %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.7.0-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Jun 06 2019 Marian Koncek - 1.7.0-1 - Update to upstream version 1.7.0 From 2b9593d0b79125e5dc68bcb8b962036dcdb1516b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 17 Apr 2020 11:22:33 +0200 Subject: [PATCH 07/11] Make use of cup launcher --- jflex.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jflex.spec b/jflex.spec index 61da111..08a57ee 100644 --- a/jflex.spec +++ b/jflex.spec @@ -68,7 +68,7 @@ This package provides %{summary}. sed -i /%%inputstreamctor/d src/main/jflex/LexScan.flex %build -java -jar $(find-jar java_cup) -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup +cup -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex %mvn_build From 6069498d47fdf15588aa74b0e05e03deb94634ac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 May 2020 17:34:09 +0200 Subject: [PATCH 08/11] Mavenize buildrequires --- jflex.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jflex.spec b/jflex.spec index 08a57ee..8c8f242 100644 --- a/jflex.spec +++ b/jflex.spec @@ -14,12 +14,12 @@ Source4: %{name}.1 Source5: create-tarball.sh BuildRequires: maven-local -BuildRequires: ant +BuildRequires: mvn(java_cup:java_cup) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.ant:ant) + BuildRequires: jflex -BuildRequires: junit -BuildRequires: sonatype-oss-parent -BuildRequires: java-devel -BuildRequires: java_cup + # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools From 33e57b65d0a51edf52dde8da8de521650e130fc3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 09/11] Conditionalize buildrequires in bootstrap mode --- jflex.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jflex.spec b/jflex.spec index 8c8f242..6204fe6 100644 --- a/jflex.spec +++ b/jflex.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Summary: Fast Scanner Generator Name: jflex Version: 1.7.0 @@ -14,11 +16,17 @@ Source4: %{name}.1 Source5: create-tarball.sh BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(java_cup:java_cup) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) +%endif +%if %{without bootstrap} BuildRequires: jflex +%endif # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions From 2f0428509d1cf188017c6fa788683c2da075383d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 19:02:36 +0200 Subject: [PATCH 10/11] Set PATH when calling cup and jflex in bootstrap mode --- jflex.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/jflex.spec b/jflex.spec index 6204fe6..f9d04b3 100644 --- a/jflex.spec +++ b/jflex.spec @@ -76,6 +76,7 @@ This package provides %{summary}. sed -i /%%inputstreamctor/d src/main/jflex/LexScan.flex %build +%{?jpb_env} cup -parser LexParse -interface -destdir src/main/java src/main/cup/LexParse.cup jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex %mvn_build From 8e831da58ba2a10241fb230059aadfcb3b6d9be9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 11/11] Turn off bootstrap mode by default --- jflex.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jflex.spec b/jflex.spec index f9d04b3..7dc36f2 100644 --- a/jflex.spec +++ b/jflex.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Summary: Fast Scanner Generator Name: jflex