From 561ddb926dadbf22c4da401cb1d64fcd5491d428490b5c3664b2afef51f8b3ac Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 20 Sep 2017 20:34:19 +0000 Subject: [PATCH] Fix build with jdk9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=32 --- bsf.changes | 7 +++++++ bsf.spec | 11 +++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bsf.changes b/bsf.changes index edd0709..3e3f0bc 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 20 20:32:46 UTC 2017 - fstrba@suse.com + +- Fix javadoc errors with jdk9: use build-jar-repository instead + of system-wide CLASSPATH environmental variable +- Clean spec file and run fdupes on documentation + ------------------------------------------------------------------- Thu Sep 7 17:18:12 UTC 2017 - fstrba@suse.com diff --git a/bsf.spec b/bsf.spec index a5ee153..5c7f41f 100644 --- a/bsf.spec +++ b/bsf.spec @@ -31,6 +31,7 @@ Patch0: build-file.patch Patch1: build.properties.patch BuildRequires: ant BuildRequires: apache-commons-logging +BuildRequires: fdupes BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -38,7 +39,6 @@ BuildRequires: rhino BuildRequires: xalan-j2 BuildRequires: xml-commons-apis BuildArch: noarch -BuildConflicts: java-devel >= 1.9 %description Bean Scripting Framework (BSF) is a set of Java classes that provides @@ -91,11 +91,9 @@ rm -fr bsf %patch1 -p1 %build -[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java -export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2 servlet jspapi) -ant jar -rm -rf bsf/src/org/apache/bsf/engines/java -ant javadocs +mkdir -p lib +build-jar-repository -s -p lib apache-commons-logging rhino xalan-j2 +%{ant} jar javadocs %install # jar @@ -110,6 +108,7 @@ install -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files %doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt