rpm/bsf
SHA256
1
0
Fork 0
forked from pool/bsf
Code Pull Requests Activity

Fix build with jdk9

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=32
This commit is contained in:
Fridrich Strba 2017-09-20 20:34:19 +00:00 committed by Git OBS Bridge
parent 195ff5a7c9
commit 561ddb926d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bsf.changes
View File

@ -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

11
bsf.spec
View File

@ -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