Fix build on systems where jdk9 is the default
OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=30
This commit is contained in:
parent
cc2e363758
commit
195ff5a7c9
7
bsf.spec
7
bsf.spec
@ -31,15 +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
|
||||||
# Disable this one whenever the javadoc build is fixed for jdk9
|
BuildRequires: java-devel >= 1.6
|
||||||
BuildRequires: java-1_8_0-openjdk-devel
|
|
||||||
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
|
||||||
@ -113,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}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user