diff --git a/.gitignore b/.gitignore index 38532b1..b174a15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ SOURCES/jflex-1.7.0-clean.tar.gz -SOURCES/jflex.png diff --git a/.jflex.metadata b/.jflex.metadata index f497f94..05aec57 100644 --- a/.jflex.metadata +++ b/.jflex.metadata @@ -1,2 +1 @@ 366ef8456b6d602d8f4ab495e877563f7d92a341 SOURCES/jflex-1.7.0-clean.tar.gz -11df8c3abc0868894b3480c0221ecb00b6eb5aa1 SOURCES/jflex.png diff --git a/SOURCES/jflex.desktop b/SOURCES/jflex.desktop deleted file mode 100644 index cec6e07..0000000 --- a/SOURCES/jflex.desktop +++ /dev/null @@ -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; diff --git a/SPECS/jflex.spec b/SPECS/jflex.spec index 61da111..850c5b8 100644 --- a/SPECS/jflex.spec +++ b/SPECS/jflex.spec @@ -1,28 +1,30 @@ -Summary: Fast Scanner Generator +%bcond_with bootstrap + Name: jflex Version: 1.7.0 -Release: 2%{?dist} -License: BSD -URL: http://jflex.de/ +Release: 41%{?dist} +Summary: Fast Scanner Generator +License: BSD-3-Clause +URL: https://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 -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools +%endif %description JFlex is a lexical analyzer generator (also known as scanner @@ -39,10 +41,10 @@ standalone tool. Summary: API documentation for %{name} %description javadoc -This package provides %{summary}. +API documentation for %{name}. %prep -%setup -q +%autosetup -p1 %mvn_file : %{name} %pom_add_dep java_cup:java_cup @@ -68,10 +70,10 @@ 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 - +%mvn_build -- -P\!error-prone -Djflex.jdk.version=1.8 %install %mvn_install @@ -83,31 +85,95 @@ 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 +%license COPYRIGHT %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1.gz - -%files javadoc -%doc COPYRIGHT -%doc %{_javadocdir}/%{name} +%{_mandir}/man1/%{name}.1* +%files javadoc -f .mfiles-javadoc +%license COPYRIGHT %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.7.0-39 +- Drop explicit requires on javapackages-tools + +* Wed Jul 24 2024 Mikolaj Izdebski - 1.7.0-20 +- Install license files in licensedir instead of docdir + +* Thu Jul 18 2024 Fedora Release Engineering - 1.7.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.7.0-18 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 1.7.0-17 +- Update Java source/target to 1.8 + +* Wed Jan 24 2024 Fedora Release Engineering - 1.7.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1.7.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.7.0-14 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 1.7.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.7.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.7.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.7.0-10 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.7.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Nov 20 2021 Mikolaj Izdebski - 1.7.0-8 +- Remove unused sources + +* Thu Jul 22 2021 Fedora Release Engineering - 1.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.7.0-6 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.7.0-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 1.7.0-2 - Mass rebuild for javapackages-tools 201902 +* Wed Aug 14 2019 Fabio Valentini - 1.7.0-1 +- Update to version 1.7.0. + +* Thu Jul 25 2019 Fedora Release Engineering - 1.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * 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 +* Fri Feb 01 2019 Fedora Release Engineering - 1.6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jul 31 2018 Severin Gehwolf - 1.6.1-12 - Add requirement on javapackages-tools for scripts using java-functions. @@ -245,7 +311,7 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1 to allow building with the new gcj * Mon Feb 12 2007 Matt Wringe - 0:1.3.5-2jpp.1 -- Remove javadoc post and postun sections due to new jpp standard +- Remove javadoc post and postun sections due to new jpp standard - Update makefile patch to compress jar - Fix rpmlint issues