Fridrich Strba 2018-05-15 06:05:23 +00:00 committed by Git OBS Bridge
parent c4d5ce4a82
commit 1d2ff22747
2 changed files with 16 additions and 10 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 15 05:00:18 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility in OpenJDK 11
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 10 03:57:04 UTC 2018 - bwiedemann@suse.com Wed Jan 10 03:57:04 UTC 2018 - bwiedemann@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package aelfred # spec file for package aelfred
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,13 +22,13 @@ Release: 0
Summary: Java-based XML parser Summary: Java-based XML parser
License: BSD-3-Clause License: BSD-3-Clause
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://saxon.sourceforge.net/aelfred.html URL: http://saxon.sourceforge.net/aelfred.html
Source0: http://downloads.sourceforge.net/project/saxon/aelfred/7.0/aelfred7_0.zip Source0: http://downloads.sourceforge.net/project/saxon/aelfred/7.0/aelfred7_0.zip
Patch0: aelfred-icedtea-build.patch Patch0: aelfred-icedtea-build.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel >= 1.7
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: unzip BuildRequires: unzip
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%description %description
@ -54,15 +54,15 @@ Demonstrations and samples for aelfred.
%prep %prep
%setup -q -c %setup -q -c
unzip %{name}-source.zip unzip %{name}-source.zip
%patch0 -p0 %patch0
%build %build
export JAVA_HOME=%{java_home} export JAVA_HOME=%{java_home}
export PATH=%{java_home}/bin:$PATH export PATH=%{java_home}/bin:$PATH
export CLASSPATH= export CLASSPATH=
cd net cd net
%{javac} -source 1.6 `find . -name \*.java` %{javac} -source 8 -target 8 `find . -name \*.java`
%{javadoc} -notimestamp -source 1.6 -d ../HTML `find . -name \*.java` %{javadoc} -notimestamp -source 8 -d ../HTML `find . -name \*.java`
%install %install
# jar # jar