Hello community, here is the log from the commit of package tanukiwrapper for openSUSE:Factory checked in at 2018-01-09 14:56:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tanukiwrapper (Old) and /work/SRC/openSUSE:Factory/.tanukiwrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tanukiwrapper" Tue Jan 9 14:56:25 2018 rev:14 rq:562819 version:3.5.32 Changes: -------- --- /work/SRC/openSUSE:Factory/tanukiwrapper/tanukiwrapper.changes 2018-01-03 13:39:47.406225258 +0100 +++ /work/SRC/openSUSE:Factory/.tanukiwrapper.new/tanukiwrapper.changes 2018-01-09 14:56:26.514664546 +0100 @@ -1,0 +2,9 @@ +Tue Jan 9 10:12:44 UTC 2018 - [email protected] + +- Added patch: + * tanukiwrapper-nojavah.patch + - Fix build with jdk10 +- Require java 8 or higher for build in order to be able to use + javac's -h option + +------------------------------------------------------------------- New: ---- tanukiwrapper-nojavah.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tanukiwrapper.spec ++++++ --- /var/tmp/diff_new_pack.ApPKZ3/_old 2018-01-09 14:56:27.786604924 +0100 +++ /var/tmp/diff_new_pack.ApPKZ3/_new 2018-01-09 14:56:27.794604548 +0100 @@ -27,18 +27,18 @@ Source0: http://download.sourceforge.net/wrapper/wrapper_%{version}_src.tar.gz Source1: wrapper.1 Patch0: %{name}-additional-makefiles.patch +Patch1: %{name}-nojavah.patch 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 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: perl BuildRequires: xerces-j2 BuildRequires: xml-commons-apis -BuildConflicts: java-devel >= 10 %description The Java Service Wrapper is an application which has @@ -69,6 +69,7 @@ %prep %setup -q -n wrapper_%{version}_src %patch0 -p1 +%patch1 -p1 find . -name "*.jar" -exec rm -f {} \; perl -p -i -e 's|-O3|%{optflags}|' src/c/Makefile* ++++++ tanukiwrapper-nojavah.patch ++++++ --- wrapper_3.5.32_src/build.xml 2018-01-09 11:05:11.144063035 +0100 +++ wrapper_3.5.32_src/build.xml 2018-01-09 11:08:31.392063791 +0100 @@ -562,7 +562,7 @@ <mkdir dir="${lib.dir}"/> <!-- compile everything under src/java --> - <javac srcdir="${src.dir}/java" destdir="${build.classes}" + <javac srcdir="${src.dir}/java" destdir="${build.classes}" nativeheaderdir="${src.dir}/c" deprecation="on" debug="on" optimize="on" @@ -592,39 +592,6 @@ </fileset> </copy> - <!-- Generate the jni header files. This is done here rather than with the - c code to make intermediate pre-release distributions possible. --> - <javah - destdir="${src.dir}/c" - classpath="${build.classes}"> - <class name="org.tanukisoftware.wrapper.WrapperManager"/> - </javah> - <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperManager.h" eol="lf" /> - <javah - destdir="${src.dir}/c" - classpath="${build.classes}"> - <class name="org.tanukisoftware.wrapper.WrapperProcessInputStream"/> - </javah> - <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessInputStream.h" eol="lf" /> - <javah - destdir="${src.dir}/c" - classpath="${build.classes}"> - <class name="org.tanukisoftware.wrapper.WrapperProcessOutputStream"/> - </javah> - <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessOutputStream.h" eol="lf" /> - <javah - destdir="${src.dir}/c" - classpath="${build.classes}"> - <class name="org.tanukisoftware.wrapper.WrapperProcessConfig"/> - </javah> - <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperProcessConfig.h" eol="lf" /> - <javah - destdir="${src.dir}/c" - classpath="${build.classes}"> - <class name="org.tanukisoftware.wrapper.WrapperResources"/> - </javah> - <fixcrlf srcdir="${src.dir}/c" includes="org_tanukisoftware_wrapper_WrapperResources.h" eol="lf" /> - <available property="junit.present" classname="junit.framework.TestCase"> <classpath refid="project.class.path"/>
