Hello community, here is the log from the commit of package tanukiwrapper for openSUSE:Factory checked in at 2018-04-16 12:48:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tanukiwrapper (Old) and /work/SRC/openSUSE:Factory/.tanukiwrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tanukiwrapper" Mon Apr 16 12:48:54 2018 rev:16 rq:596370 version:3.5.32 Changes: -------- --- /work/SRC/openSUSE:Factory/tanukiwrapper/tanukiwrapper.changes 2018-01-13 21:46:59.951888182 +0100 +++ /work/SRC/openSUSE:Factory/.tanukiwrapper.new/tanukiwrapper.changes 2018-04-16 12:48:54.925273031 +0200 @@ -1,0 +2,14 @@ +Fri Apr 13 13:44:56 UTC 2018 - [email protected] + +- fix build on aarch64 and s390x + Modified: + * tanukiwrapper-additional-makefiles.patch + +------------------------------------------------------------------- +Fri Apr 13 13:29:00 UTC 2018 - [email protected] + +- Apply tanukiwrapper-nojavah.patch only if building with java 10 + or above, that does not have the javah tool. +- Relax the java-devel requirement to any version >= 1.6 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tanukiwrapper.spec ++++++ --- /var/tmp/diff_new_pack.csBuoi/_old 2018-04-16 12:48:55.941236074 +0200 +++ /var/tmp/diff_new_pack.csBuoi/_new 2018-04-16 12:48:55.945235928 +0200 @@ -21,7 +21,7 @@ Version: 3.5.32 Release: 0 Summary: Java Service Wrapper -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Languages/Java Url: http://wrapper.tanukisoftware.org/ Source0: http://download.sourceforge.net/wrapper/wrapper_%{version}_src.tar.gz @@ -34,7 +34,7 @@ BuildRequires: cunit-devel BuildRequires: fdupes BuildRequires: glibc-devel -BuildRequires: java-devel >= 1.8 +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-tools BuildRequires: perl BuildRequires: xerces-j2 @@ -69,7 +69,9 @@ %prep %setup -q -n wrapper_%{version}_src %patch0 -p1 +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 10}%{!?pkg_vcmp:0} %patch1 -p1 +%endif find . -name "*.jar" -exec rm -f {} \; perl -p -i -e 's|-O3|%{optflags}|' src/c/Makefile* @@ -119,7 +121,7 @@ %{_sbindir}/%{name} %{_libdir}/libwrapper.so %{_javadir}/%{name}*.jar -%{_mandir}/man1/%{name}.1%{ext_man} +%{_mandir}/man1/%{name}.1%{?ext_man} %files javadoc %{_javadocdir}/%{name} ++++++ tanukiwrapper-additional-makefiles.patch ++++++ --- /var/tmp/diff_new_pack.csBuoi/_old 2018-04-16 12:48:55.973234910 +0200 +++ /var/tmp/diff_new_pack.csBuoi/_new 2018-04-16 12:48:55.973234910 +0200 @@ -1,7 +1,9 @@ Description: linux makefiles for other architectures +Index: wrapper_3.5.32_src/src/c/Makefile-linux-mips-32.make +=================================================================== --- /dev/null -+++ b/src/c/Makefile-linux-mips-32.make ++++ wrapper_3.5.32_src/src/c/Makefile-linux-mips-32.make @@ -0,0 +1,49 @@ + +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. @@ -52,8 +54,10 @@ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp +Index: wrapper_3.5.32_src/src/c/Makefile-linux-mipsel-32.make +=================================================================== --- /dev/null -+++ b/src/c/Makefile-linux-mipsel-32.make ++++ wrapper_3.5.32_src/src/c/Makefile-linux-mipsel-32.make @@ -0,0 +1,49 @@ + +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. @@ -104,8 +108,10 @@ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp +Index: wrapper_3.5.32_src/src/c/Makefile-linux-s390x-64.make +=================================================================== --- /dev/null -+++ b/src/c/Makefile-linux-s390x-64.make ++++ wrapper_3.5.32_src/src/c/Makefile-linux-s390x-64.make @@ -0,0 +1,49 @@ + +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. @@ -123,7 +129,7 @@ + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + -+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c ++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o + @@ -156,8 +162,10 @@ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp +Index: wrapper_3.5.32_src/src/c/Makefile-linux-sparc-32.make +=================================================================== --- /dev/null -+++ b/src/c/Makefile-linux-sparc-32.make ++++ wrapper_3.5.32_src/src/c/Makefile-linux-sparc-32.make @@ -0,0 +1,49 @@ + +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. @@ -208,8 +216,10 @@ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp +Index: wrapper_3.5.32_src/src/c/Makefile-linux-sparc-64.make +=================================================================== --- /dev/null -+++ b/src/c/Makefile-linux-sparc-64.make ++++ wrapper_3.5.32_src/src/c/Makefile-linux-sparc-64.make @@ -0,0 +1,49 @@ + +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. @@ -260,8 +270,10 @@ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp +Index: wrapper_3.5.32_src/src/c/Makefile-linux-aarch64-64.make +=================================================================== --- /dev/null -+++ b/src/c/Makefile-linux-aarch64-64.make ++++ wrapper_3.5.32_src/src/c/Makefile-linux-aarch64-64.make @@ -0,0 +1,49 @@ + +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. @@ -279,7 +291,7 @@ + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + -+wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c ++wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c wrapper_ulimit.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o + @@ -312,9 +324,11 @@ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp ---- a/src/c/Makefile-linux-ppcle-64.make -+++ b/src/c/Makefile-linux-ppcle-64.make -@@ -33,10 +33,10 @@ +Index: wrapper_3.5.32_src/src/c/Makefile-linux-ppcle-64.make +=================================================================== +--- wrapper_3.5.32_src.orig/src/c/Makefile-linux-ppcle-64.make ++++ wrapper_3.5.32_src/src/c/Makefile-linux-ppcle-64.make +@@ -33,10 +33,10 @@ init: if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE)
