Accepting request 962941 from Java:packages

Build with source/target levels 8

OBS-URL: https://build.opensuse.org/request/show/962941
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javacc?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2022-03-28 14:59:11 +00:00 committed by Git OBS Bridge
commit c6e329ea26
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 18 19:26:58 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source/target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 9 14:37:13 UTC 2019 - Fridrich Strba <fstrba@suse.com> Tue Apr 9 14:37:13 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package javacc # spec file
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2022 SUSE LLC
# Copyright (c) 2000-2005, JPackage Project # Copyright (c) 2000-2005, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -29,9 +29,10 @@ Release: 0
Summary: A Parser and Scanner Generator for Java Summary: A Parser and Scanner Generator for Java
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://javacc.org URL: https://javacc.org
Source0: https://github.com/javacc/javacc/archive/%{version}.tar.gz Source0: https://github.com/javacc/javacc/archive/%{version}.tar.gz
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel >= 1.8
BuildArch: noarch BuildArch: noarch
%if %{with bootstrap} %if %{with bootstrap}
Name: %{base_name}-bootstrap Name: %{base_name}-bootstrap
@ -95,7 +96,7 @@ find ./examples -type f -exec sed -i 's/\r//' {} \;
%build %build
%{ant} \ %{ant} \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
%if %{with bootstrap} %if %{with bootstrap}
jar jar
%else %else
@ -131,6 +132,7 @@ ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
%files %files
%{_javadir}/%{base_name}.jar %{_javadir}/%{base_name}.jar
%else %else
%files -f .mfiles %files -f .mfiles
%{_bindir}/javacc %{_bindir}/javacc
%{_bindir}/javacc.sh %{_bindir}/javacc.sh