Merge modular branch

This commit is contained in:
Mikolaj Izdebski 2021-05-13 21:43:36 +02:00
commit f9146b2fda
2 changed files with 26 additions and 15 deletions

View File

@ -1,5 +1,6 @@
%bcond_with bootstrap
%global pkg_version 11b
%global with_bootstrap 0
Name: java_cup
Version: 0.11b
@ -19,13 +20,19 @@ Source4: %{name}-runtime-MANIFEST.MF
Patch0: %{name}-build.patch
BuildRequires: ant
BuildRequires: javapackages-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: ant
BuildRequires: jflex
%if ! %{with_bootstrap}
BuildRequires: java_cup >= 1:0.11a
BuildRequires: java_cup
%endif
# Explicit javapackages-tools requires since scripts use
# /usr/share/java-utils/java-functions
Requires: javapackages-tools
%description
java_cup is a LALR Parser Generator for Java
@ -46,31 +53,25 @@ Documentation for java_cup.
%setup -q
%patch0 -b .build
sed -i '/<javac/s/1.5/1.6/g' build.xml
# remove all binary files
find -name "*.class" -delete
%mvn_file ':{*}' @1
%if ! %{with_bootstrap}
# remove prebuilt JFlex
rm -rf java_cup-%{version}/bin/JFlex.jar
# remove prebuilt java_cup, if not bootstrapping
rm -rf java_cup-%{version}/bin/java-cup-11.jar
%endif
# Use source/target 1.6 for Java 11
sed -i 's/source="1.5"/source="1.6"/' build.xml
sed -i 's/target="1.5"/target="1.6"/' build.xml
%build
%if ! %{with_bootstrap}
export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex)
%endif
ant -Dcupversion=20150326 -Dsvnversion=65
%ant -Dcupversion=20150326 -Dsvnversion=65
find -name parser.cup -delete
ant javadoc
%ant javadoc
# inject OSGi manifests
jar ufm dist/java-cup-%{pkg_version}.jar %{SOURCE2}
@ -82,7 +83,11 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
%mvn_install -J dist/javadoc
# wrapper script for direct execution
%jpackage_script java_cup.Main "" "" java_cup cup true
%files -f .mfiles
%{_bindir}/cup
%doc changelog.txt
%license licence.txt
@ -109,9 +114,15 @@ jar ufm dist/java-cup-%{pkg_version}-runtime.jar %{SOURCE4}
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-10
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:0.11b-9
- Mass rebuild for javapackages-tools 201901
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.11b-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
738656753ed84fb25c9cbe29ab9f05fc java_cup-0.11b.tar.bz2
SHA512 (java_cup-0.11b.tar.bz2) = b5528d1e7ca193331a5c431b86d273d840bee08d7a02453ac1c9a2c9890b2f2ab889dd63b3ae123d1185ea55601e2b045f8d743170dab0648eac50f9861ab8c8