diff --git a/jlex-1.2.6.build.xml b/jlex-1.2.6.build.xml index 05ee1c8..186e330 100644 --- a/jlex-1.2.6.build.xml +++ b/jlex-1.2.6.build.xml @@ -52,9 +52,7 @@ destdir="${build.dir}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" - optimize="${compile.optimize}" - source="1.5" - target="1.5" /> + optimize="${compile.optimize}" /> diff --git a/jlex.changes b/jlex.changes index e8fab0d..ea17a3c 100644 --- a/jlex.changes +++ b/jlex.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 3 11:03:47 UTC 2017 - fstrba@suse.com + +- Build with source and target level 1.6 and do not require + java-gcj-compat +- Clean spec file + ------------------------------------------------------------------- Fri Aug 23 09:22:06 UTC 2013 - mvyskocil@suse.com diff --git a/jlex.spec b/jlex.spec index 6b9460d..e5f50f2 100644 --- a/jlex.spec +++ b/jlex.spec @@ -1,7 +1,7 @@ # # spec file for package jlex # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,52 +14,50 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# icecream 0 -Name: jlex -BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel -BuildRequires: xml-commons-apis-bootstrap -#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 -#!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12 -%define name jlex -%define version 1.2.6 -%define release 2jpp %define section free +Name: jlex Version: 1.2.6 Release: 0 Summary: A Lexical Analyzer Generator for Java License: BSD-3-Clause Group: Development/Libraries/Java +Url: http://www.cs.princeton.edu/~appel/modern/java/JLex/ Source0: http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.5/Main.java Source1: %{name}-%{version}.build.xml Patch0: %{name}-%{version}.static.patch -Url: http://www.cs.princeton.edu/~appel/modern/java/JLex/ +BuildRequires: ant +BuildRequires: java-devel +BuildRequires: xml-commons-apis-bootstrap +#!BuildIgnore: xerces-j2 +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-apis +#!BuildIgnore: xml-commons-jaxp-1.3-apis +#!BuildIgnore: xml-commons-resolver +#!BuildIgnore: xml-commons-resolver12 BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description JLex is a lexical analyzer generator for Java. %prep -%setup -c -T +%setup -q -c -T cp %{SOURCE0} . -%patch0 -p0 +%patch0 cp %{SOURCE1} build.xml %build unset CLASSPATH -ant +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 %install # jar -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 dist/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 dist/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) %files -%defattr(-,root,root,-) %{_javadir}/* %changelog