.gitignore

@@ -1,2 +0,0 @@
-SOURCES/jflex-1.7.0-clean.tar.gz
-SOURCES/jflex.png

.jflex.metadata

@@ -1,2 +1,2 @@
 366ef8456b6d602d8f4ab495e877563f7d92a341 SOURCES/jflex-1.7.0-clean.tar.gz
-11df8c3abc0868894b3480c0221ecb00b6eb5aa1 SOURCES/jflex.png
+2cf77eacbcbd5fec51592376614a6db05346bd0d SOURCES/create-tarball.sh

SOURCES/create-tarball.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-if [ $# -ne 1 ]; then
-    echo "Usage: ./create-tarball.sh VERSION"
-    exit 1
-fi
-
-VERSION=${1}
-NAME="jflex"
-
-wget http://jflex.de/release/${NAME}-${VERSION}.tar.gz
-tar xvf ${NAME}-${VERSION}.tar.gz
-
-(
-  cd ${NAME}-${VERSION}
-  find . -name "*.jar" -delete
-  rm -Rf src/main/java/java_cup/ examples/
-)
-
-tar czvf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION}
-rm -Rf ${NAME}-${VERSION}.tar.gz ${NAME}-${VERSION}
-

SOURCES/jflex.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=JFlex
-GenericName=JFlex
-Comment=Fast Scanner Generator for Java
-Exec=jflex
-Icon=jflex
-Terminal=false
-Type=Application
-Categories=Development;

SPECS/jflex.spec

@@ -1,25 +1,32 @@
+%bcond_with bootstrap
+
 Summary:        Fast Scanner Generator
 Name:           jflex
 Version:        1.7.0
-Release:        2%{?dist}
+Release:        11%{?dist}
 License:        BSD
 URL:            http://jflex.de/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 # ./create-tarball.sh %%{version}
 Source0:        %{name}-%{version}-clean.tar.gz
-Source2:        %{name}.desktop
-Source3:        %{name}.png
 Source4:        %{name}.1
 Source5:        create-tarball.sh
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
-BuildRequires:  ant
+BuildRequires:  mvn(java_cup:java_cup)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.ant:ant)
+%endif
+
+%if %{without bootstrap}
 BuildRequires:  jflex
-BuildRequires:  junit
-BuildRequires:  sonatype-oss-parent
-BuildRequires:  java-devel
-BuildRequires:  java_cup
+%endif
+
 # Explicit javapackages-tools requires since scripts use
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
@@ -68,11 +75,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
 
-
 %install
 %mvn_install
 
@@ -83,15 +90,11 @@ jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jfle
 install -d -m 755 %{buildroot}%{_mandir}/man1
 install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
 
-# .desktop + icons
-
-# Emacs files
-
 %files -f .mfiles
 %doc doc
 %doc COPYRIGHT
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}.1*
 
 %files javadoc
 %doc COPYRIGHT
@@ -99,15 +102,55 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.7.0-10
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Sat Nov 20 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-8
+- Remove unused sources
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* 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
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.7.0-3
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* 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
+
 * Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1.6.1-12
 - Add requirement on javapackages-tools for scripts using
   java-functions.