Compare commits

...

No commits in common. "c8-stream-201902" and "stream-javapackages-tools-201801-rhel-8.9.0" have entirely different histories.

8 changed files with 44 additions and 31 deletions

9
.gitignore vendored
View File

@ -1,2 +1,7 @@
SOURCES/jflex-1.7.0-clean.tar.gz
SOURCES/jflex.png
jflex-1.4.1.tar.gz
jflex-1.4.3.tar.gz
/jflex-1.4.3-clean.tar.gz
/jflex-1.5.0-clean.tar.gz
/jflex-1.5.1-clean.tar.gz
/jflex-1.6.0-clean.tar.gz
/jflex-1.6.1-clean.tar.gz

View File

@ -1,2 +1 @@
366ef8456b6d602d8f4ab495e877563f7d92a341 SOURCES/jflex-1.7.0-clean.tar.gz
11df8c3abc0868894b3480c0221ecb00b6eb5aa1 SOURCES/jflex.png
83ec7bb78e312672df320bc9869f88df3ef15506 jflex-1.6.1-clean.tar.gz

View File

@ -8,7 +8,7 @@ fi
VERSION=${1}
NAME="jflex"
wget http://jflex.de/release/${NAME}-${VERSION}.tar.gz
wget http://jflex.de/${NAME}-${VERSION}.tar.gz
tar xvf ${NAME}-${VERSION}.tar.gz
(

BIN
jflex.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@ -1,7 +1,10 @@
%bcond_without desktop
%bcond_without emacs
Summary: Fast Scanner Generator
Name: jflex
Version: 1.7.0
Release: 2%{?dist}
Version: 1.6.1
Release: 12%{?dist}
License: BSD
URL: http://jflex.de/
BuildArch: noarch
@ -20,6 +23,13 @@ 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
@ -46,32 +56,22 @@ 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" "<argLine>-Xss16384k</argLine>"
%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
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
%mvn_build
%if %{with emacs}
# Compile Emacs jflex-mode source
%{_emacs_bytecompile} lib/jflex-mode.el
%endif
%install
%mvn_install
@ -84,14 +84,31 @@ 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
@ -99,15 +116,6 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-2
- Mass rebuild for javapackages-tools 201902
* 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
* Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1.6.1-12
- Add requirement on javapackages-tools for scripts using
java-functions.

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (jflex-1.6.1-clean.tar.gz) = 65668407d0a06a59360baeebe5c97274927e3601f7ebc4dc4a6c806af7cfa3c6f746fb05d3fae7f415a79db8e892cb412b8d76abbba2cfc75cc63b158a39a9f8