2017-09-20 09:34:27 +00:00
committed by Git OBS Bridge
parent 984aa11701
commit f3d76e21b4
2 changed files with 18 additions and 8 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 20 09:34:00 UTC 2017 - fstrba@suse.com
- Fix build with jdk9: specify java source and target levels 1.6
-------------------------------------------------------------------
Fri May 19 16:43:41 UTC 2017 - tchvatal@suse.com

View File

@@ -31,13 +31,13 @@ BuildRequires: ant >= 1.6.1
BuildRequires: ant-junit
BuildRequires: ant-nodeps >= 1.6.1
BuildRequires: cunit-devel
BuildRequires: fdupes
BuildRequires: glibc-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools
BuildRequires: perl
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
The Java Service Wrapper is an application which has
@@ -75,9 +75,12 @@ rm -f bin/* build/* conf/* lib/* logs/* test/* src/c/*.o src/c/wrapperinfo.c
%build
export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis)
ant -Dbuild.sysclasspath=first -Dbits=%{__isa_bits}
ant \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Djavac.target.version=1.6 -Djava.specification.version=1.6 \
-Dbuild.sysclasspath=first -Dbits=%{__isa_bits}
javadoc -sourcepath src/java -d build/javadoc org.tanukisoftware.wrapper
javadoc -source 1.6 -sourcepath src/java -d build/javadoc org.tanukisoftware.wrapper
%install
# jar
@@ -96,28 +99,30 @@ install -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name}
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -a build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
# manpage
mkdir -p %{buildroot}%{_mandir}/man1
install -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1
%check
ant -Dbuild.sysclasspath=first -Dbits=%{__isa_bits} test
ant \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Djavac.target.version=1.6 -Djava.specification.version=1.6 \
-Dbuild.sysclasspath=first -Dbits=%{__isa_bits} \
test
%files
%defattr(-,root,root,-)
%doc doc/wrapper-community-license-1.3.txt
%{_sbindir}/%{name}
%{_libdir}/libwrapper.so
%{_javadir}/%{name}*.jar
%{_mandir}/man1/%{name}.1.*
%{_mandir}/man1/%{name}.1%{ext_man}
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}
%files manual
%defattr(0644,root,root,0755)
%doc doc/*
%changelog