From 3d0564780d87e4335fffbd9090f847b65eca24e2 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 8 Jun 2021 20:17:56 +0200
Subject: [PATCH] Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482
---
 jflex.spec | 62 ++++++++++++++++++++++++------------------------------
 sources    |  2 +-
 2 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/jflex.spec b/jflex.spec
index b3ee674..dba0fe8 100644
--- a/jflex.spec
+++ b/jflex.spec
@@ -1,10 +1,13 @@
-%bcond_without desktop
-%bcond_without emacs
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_without bootstrap
 
 Summary:        Fast Scanner Generator
 Name:           jflex
 Version:        1.7.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        BSD
 URL:            http://jflex.de/
 BuildArch:      noarch
@@ -16,19 +19,17 @@ Source3:        %{name}.png
 Source4:        %{name}.1
 Source5:        create-tarball.sh
 
-BuildRequires:  jflex
 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)
-
-%if %{with desktop}
-BuildRequires:  desktop-file-utils
 %endif
 
-%if %{with emacs}
-BuildRequires:  emacs
-Requires:       emacs-filesystem >= %{_emacs_version}
+%if %{without bootstrap}
+BuildRequires:  jflex
 %endif
 
 # Explicit javapackages-tools requires since scripts use
@@ -79,14 +80,11 @@ 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
+%{?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
 
-%if %{with emacs}
-# Compile Emacs jflex-mode source
-%{_emacs_bytecompile} lib/jflex-mode.el
-%endif
 
 %install
 %mvn_install
@@ -99,31 +97,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
@@ -131,8 +112,12 @@ install -p -m 644 lib/jflex-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name}
 
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.0-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-7
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-6
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -146,12 +131,21 @@ install -p -m 644 lib/jflex-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name}
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-2
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-1
 - Update to version 1.7.0.
 
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Thu Jun 06 2019 Marian Koncek <mkoncek@redhat.com> - 1.7.0-1
+- Update to upstream version 1.7.0
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.1-13
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index db11992..609f822 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jflex-1.7.0-clean.tar.gz) = e43209af453c6557796f00d5c685e5840b0013521d28e6dadcd53e689d72b5b596f1e71eacf1bf0f1b35ef9c6ddd8ee0a846900ba970f427752c04c08c794032
+SHA512 (jflex-1.7.0-clean.tar.gz) = 4040808a543133beb1ef9243eadc1d7eb137660e6bcc3ab462fbb0799eca6c655da6ecc4e17998380b7c4abc167a361f05f45c3fb8de112f6311e232602efd09