Compare commits

..

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

12 changed files with 28 additions and 92 deletions

View File

@ -1 +0,0 @@
1

13
.gitignore vendored
View File

@ -1,11 +1,2 @@
/results_* SOURCES/jflex-1.7.0-clean.tar.gz
/*.src.rpm 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
/jflex-1.7.0-clean.tar.gz

2
.jflex.metadata Normal file
View File

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

9
SOURCES/jflex.desktop Normal file
View File

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

View File

@ -1,32 +1,25 @@
%bcond_with bootstrap
Summary: Fast Scanner Generator Summary: Fast Scanner Generator
Name: jflex Name: jflex
Version: 1.7.0 Version: 1.7.0
Release: 11%{?dist} Release: 2%{?dist}
License: BSD License: BSD
URL: http://jflex.de/ URL: http://jflex.de/
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
# ./create-tarball.sh %%{version} # ./create-tarball.sh %%{version}
Source0: %{name}-%{version}-clean.tar.gz Source0: %{name}-%{version}-clean.tar.gz
Source2: %{name}.desktop
Source3: %{name}.png
Source4: %{name}.1 Source4: %{name}.1
Source5: create-tarball.sh Source5: create-tarball.sh
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(java_cup:java_cup) BuildRequires: ant
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.ant:ant)
%endif
%if %{without bootstrap}
BuildRequires: jflex BuildRequires: jflex
%endif BuildRequires: junit
BuildRequires: sonatype-oss-parent
BuildRequires: java-devel
BuildRequires: java_cup
# Explicit javapackages-tools requires since scripts use # Explicit javapackages-tools requires since scripts use
# /usr/share/java-utils/java-functions # /usr/share/java-utils/java-functions
Requires: javapackages-tools Requires: javapackages-tools
@ -75,11 +68,11 @@ This package provides %{summary}.
sed -i /%%inputstreamctor/d src/main/jflex/LexScan.flex sed -i /%%inputstreamctor/d src/main/jflex/LexScan.flex
%build %build
%{?jpb_env} 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 jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jflex/LexScan.flex
%mvn_build %mvn_build
%install %install
%mvn_install %mvn_install
@ -90,11 +83,15 @@ jflex -d src/main/java/jflex --skel src/main/jflex/skeleton.nested src/main/jfle
install -d -m 755 %{buildroot}%{_mandir}/man1 install -d -m 755 %{buildroot}%{_mandir}/man1
install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1 install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
# .desktop + icons
# Emacs files
%files -f .mfiles %files -f .mfiles
%doc doc %doc doc
%doc COPYRIGHT %doc COPYRIGHT
%{_bindir}/%{name} %{_bindir}/%{name}
%{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}.1.gz
%files javadoc %files javadoc
%doc COPYRIGHT %doc COPYRIGHT
@ -102,55 +99,15 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
%changelog %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 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.0-2
- Mass rebuild for javapackages-tools 201902 - 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 * Thu Jun 06 2019 Marian Koncek <mkoncek@redhat.com> - 1.7.0-1
- Update to upstream version 1.7.0 - Update to upstream version 1.7.0
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.1-13 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.1-13
- Mass rebuild for javapackages-tools 201901 - 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 * Tue Jul 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1.6.1-12
- Add requirement on javapackages-tools for scripts using - Add requirement on javapackages-tools for scripts using
java-functions. java-functions.

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

@ -1,9 +0,0 @@
--- !Policy
product_versions:
- fedora-*
decision_contexts:
- bodhi_update_push_testing
- bodhi_update_push_stable
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional}
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

View File

@ -1,7 +0,0 @@
summary:
Run javapackages-specific tests
discover:
how: fmf
url: https://pagure.io/javapackages-validator-tests
execute:
how: tmt

View File

@ -1,4 +0,0 @@
summary: Basic smoke test
execute:
script:
- jflex --help

View File

@ -1 +0,0 @@
SHA512 (jflex-1.7.0-clean.tar.gz) = 4040808a543133beb1ef9243eadc1d7eb137660e6bcc3ab462fbb0799eca6c655da6ecc4e17998380b7c4abc167a361f05f45c3fb8de112f6311e232602efd09