Fix build with jdk9
OBS-URL: https://build.opensuse.org/package/show/Java:packages/avalon-logkit?expand=0&rev=23
This commit is contained in:
parent
e61bfa5518
commit
a7c4286327
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 15 09:20:19 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Fix build with jdk9 by specifying java source and target 1.6
|
||||
- Clean spec file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun May 21 08:08:29 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
|
@ -37,6 +37,7 @@ Patch3: fix-java7-compile.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: avalon-framework >= 4.1.4
|
||||
BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: javamail
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
@ -74,19 +75,19 @@ cp %{SOURCE1} pom.xml
|
||||
find . -name "*.jar" -exec rm -f {} \;
|
||||
|
||||
%build
|
||||
export CLASSPATH=%(build-classpath \
|
||||
ant clean
|
||||
mkdir -p target/lib
|
||||
build-jar-repository -s -p target/lib \
|
||||
log4j \
|
||||
javamail/mailapi \
|
||||
jms_api \
|
||||
tomcat-servlet-api \
|
||||
jdbc-stdext \
|
||||
avalon-framework \
|
||||
junit \
|
||||
):$PWD/build/classes
|
||||
|
||||
ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
|
||||
-Dencoding=ISO-8859-1 -Dnoget=true clean jar javadoc \
|
||||
-lib %{_datadir}/java
|
||||
ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
|
||||
-Dencoding=ISO-8859-1 -Dnoget=true -lib %{_datadir}/java \
|
||||
jar javadoc
|
||||
|
||||
%install
|
||||
# jars
|
||||
@ -103,14 +104,12 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
%{_javadir}/*
|
||||
%{_datadir}/maven-metadata/%{name}.xml
|
||||
%{_mavenpomdir}/JPP-%{name}.pom
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc LICENSE.txt
|
||||
%{_javadocdir}/*
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user