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

Accepting request 523232 from Java:packages

Browse Source 
Fix build on systems where jdk9 is the default

OBS-URL: https://build.opensuse.org/request/show/523232
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bsf?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2017-09-13 20:25:19 +00:00 committed by Git OBS Bridge
commit dbf62ef49c
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bsf.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Sep 7 17:18:12 UTC 2017 - fstrba@suse.com
- Force java source and target levels to 1.6 in order to allow
building with jdk9
- Force using of java-1_8_0-openjdk-devel, since javadoc errors are
fatal in jdk9
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 20 18:41:16 UTC 2017 - tchvatal@suse.com Sat May 20 18:41:16 UTC 2017 - tchvatal@suse.com

6
bsf.spec
View File

@ -31,14 +31,14 @@ Patch0: build-file.patch
Patch1: build.properties.patch Patch1: build.properties.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-logging BuildRequires: apache-commons-logging
BuildRequires: java-devel BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: rhino BuildRequires: rhino
BuildRequires: xalan-j2 BuildRequires: xalan-j2
BuildRequires: xml-commons-apis BuildRequires: xml-commons-apis
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
BuildConflicts: java-devel >= 1.9
%description %description
Bean Scripting Framework (BSF) is a set of Java classes that provides Bean Scripting Framework (BSF) is a set of Java classes that provides
@ -112,14 +112,12 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name} cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
%files %files
%defattr(-,root,root)
%doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt %doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
%{_javadir}/* %{_javadir}/*
%{_mavenpomdir}/JPP-%{name}.pom %{_mavenpomdir}/JPP-%{name}.pom
%{_datadir}/maven-metadata/%{name}.xml %{_datadir}/maven-metadata/%{name}.xml
%files javadoc %files javadoc
%defattr(-,root,root)
%dir %{_javadocdir}/%{name} %dir %{_javadocdir}/%{name}
%{_javadocdir}/%{name} %{_javadocdir}/%{name}

2
build.properties.patch
View File

@ -35,7 +35,7 @@ diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-proper
+ <property name="site.dest" location="docs"/> + <property name="site.dest" location="docs"/>
+ <property name="site.projectFile" value="stylesheets/project.xml"/> + <property name="site.projectFile" value="stylesheets/project.xml"/>
+ +
+ <property name="source.level" value="1.3" /> + <property name="source.level" value="1.6" />
+ +
+ <property name="src.dir" value="src"/> + <property name="src.dir" value="src"/>
+ +