Hello community, here is the log from the commit of package tanukiwrapper for openSUSE:Factory checked in at 2014-08-15 09:55:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tanukiwrapper (Old) and /work/SRC/openSUSE:Factory/.tanukiwrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tanukiwrapper" Changes: -------- --- /work/SRC/openSUSE:Factory/tanukiwrapper/tanukiwrapper.changes 2014-07-11 20:06:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tanukiwrapper.new/tanukiwrapper.changes 2014-08-15 09:55:47.000000000 +0200 @@ -1,0 +2,23 @@ +Mon Aug 4 08:46:11 UTC 2014 - [email protected] + +- Version bump to 3.5.25: + * Updating to latest upstream version + * Javadoc is gone from the tarball + * 8 years worth of developement, read revisions.txt in docs +- Cleanup the patches and merge all the makefile ones to one patch: + * tanukiwrapper-Makefiles.patch + * Removed patches: + + tanukiwrapper-Makefile-s390-s390x-ppc.patch + + tanukiwrapper-Makefile-aarch64.patch + + tanukiwrapper-makefile-linux-x86-32.patch +- Remove patch that breaks build: + * tanukiwrapper-crosslink.patch +- Refreshed patches + * tanukiwrapper-ppc64le.patch + +------------------------------------------------------------------- +Fri Aug 1 21:44:14 UTC 2014 - [email protected] + +- Fix ppc64le build + +------------------------------------------------------------------- Old: ---- tanukiwrapper-Makefile-aarch64.patch tanukiwrapper-Makefile-s390-s390x-ppc.patch tanukiwrapper-crosslink.patch tanukiwrapper-makefile-linux-x86-32.patch wrapper_3.2.3_src.tar.bz2 New: ---- tanukiwrapper-Makefiles.patch tanukiwrapper-ppc64le.patch wrapper_3.5.25_src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tanukiwrapper.spec ++++++ --- /var/tmp/diff_new_pack.6c0Tny/_old 2014-08-15 09:55:49.000000000 +0200 +++ /var/tmp/diff_new_pack.6c0Tny/_new 2014-08-15 09:55:49.000000000 +0200 @@ -18,24 +18,19 @@ Name: tanukiwrapper -Version: 3.2.3 +Version: 3.5.25 Release: 0 Summary: Java Service Wrapper License: MIT Group: Development/Libraries/Java Url: http://wrapper.tanukisoftware.org/ -#Source0: http://download.sourceforge.net/wrapper/wrapper_3.2.3_src.tar.bz2 -Source0: wrapper_%{version}_src.tar.bz2 +Source0: http://download.sourceforge.net/wrapper/wrapper_%{version}_src.tar.gz Patch1: %{name}-build.patch -Patch2: %{name}-crosslink.patch -Patch3: %{name}-makefile-linux-x86-32.patch -#Add Makefiles so package builds for all FC architectures. -Patch4: %{name}-Makefile-s390-s390x-ppc.patch -# The following patch is only needed for GCJ. -#Patch5: %{name}-nosun-jvm-64.patch -Patch6: %{name}-Makefile-aarch64.patch +Patch3: %{name}-Makefiles.patch +Patch7: tanukiwrapper-ppc64le.patch BuildRequires: ant >= 1.6.1 BuildRequires: ant-junit +BuildRequires: cunit-devel BuildRequires: glibc-devel BuildRequires: java-devel BuildRequires: javapackages-tools @@ -59,22 +54,6 @@ - Ease Application installations - Logging -%package javadoc -Summary: Javadoc for %{name} -Group: Documentation/HTML - -%description javadoc -The Java Service Wrapper is an application which has -evolved out of a desire to solve a number of problems -common to many Java applications: -- Run as a Windows Service or Unix Daemon -- Application Reliability -- Standard, Out of the Box Scripting -- On Demand Restarts -- Flexible Configuration -- Ease Application installations -- Logging - %package manual Summary: Documents for %{name} Group: Documentation/Other @@ -94,10 +73,8 @@ %prep %setup -q -n wrapper_%{version}_src %patch1 -%patch2 -%patch3 -%patch4 -%patch6 -p1 +%patch3 -p1 +%patch7 -p1 find . -name "*.jar" -exec rm -f {} \; perl -p -i -e 's/\r//' doc/AUTHORS perl -p -i -e 's|-O3|%{optflags}|' src/c/Makefile* @@ -112,16 +89,15 @@ %build export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis) -%ifarch x86_64 ia64 ppc64 sparc64 s390x aarch64 +%ifarch x86_64 ia64 ppc64 ppc64le sparc64 s390x aarch64 bits=64 %else bits=32 %endif ant -Dbuild.sysclasspath=first -Djdk.api=%{_javadocdir}/java -Dbits=$bits \ - main jdoc + main %install - # jar mkdir -p %{buildroot}%{_javadir} install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}.jar @@ -134,25 +110,16 @@ install -d -m 755 %{buildroot}%{_sbindir} install -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name} -# javadoc -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -a jdoc/* %{buildroot}%{_javadocdir}/%{name} - %files %defattr(-,root,root,-) -%doc doc/license.txt +%doc doc/wrapper-community-license-1.1.txt %{_sbindir}/%{name} %{_libdir}/libwrapper.so %{_javadir}/%{name}.jar -%files javadoc -%defattr(0644,root,root,0755) -%doc doc/license.txt -%{_javadocdir}/%{name} - %files manual %defattr(0644,root,root,0755) -%doc doc/license.txt *.sample +%doc doc/wrapper-community-license-1.1.txt *.sample %doc doc/* %changelog ++++++ tanukiwrapper-Makefiles.patch ++++++ diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-aarch64-64.make wrapper_3.5.25_src/src/c/Makefile-linux-aarch64-64.make --- wrapper_3.5.25_src.old/src/c/Makefile-linux-aarch64-64.make 1970-01-01 01:00:00.000000000 +0100 +++ wrapper_3.5.25_src/src/c/Makefile-linux-aarch64-64.make 2014-08-04 10:37:49.921225870 +0200 @@ -0,0 +1,54 @@ +# Copyright (c) 1999, 2014 Tanuki Software, Ltd. +# http://www.tanukisoftware.com +# All rights reserved. +# +# This software is the proprietary information of Tanuki Software. +# You shall use it only in accordance with the terms of the +# license agreement you entered into with Tanuki Software. +# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html + +COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE + +INCLUDE=$(JAVA_HOME)/include + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + +wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o + +testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +BIN = ../../bin +LIB = ../../lib +TEST = ../../test + +all: init wrapper libwrapper.so testsuite + +clean: + rm -f *.o + +cleanall: clean + rm -rf *~ .deps + rm -f $(BIN)/wrapper $(LIB)/libwrapper.so + +init: + if test ! -d .deps; then mkdir .deps; fi + +wrapper: $(wrapper_SOURCE) + $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm + +testsuite: $(testsuite_SOURCE) + $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-32.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make --- wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-32.make 2014-08-04 10:24:24.465225966 +0200 +++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make 2014-08-04 10:36:01.561225883 +0200 @@ -33,7 +33,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-64.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make --- wrapper_3.5.25_src.old/src/c/Makefile-linux-ppc-64.make 2014-08-04 10:24:24.466225966 +0200 +++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make 2014-08-04 10:36:24.849225880 +0200 @@ -33,7 +33,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-s390x-64.make wrapper_3.5.25_src/src/c/Makefile-linux-s390x-64.make --- wrapper_3.5.25_src.old/src/c/Makefile-linux-s390x-64.make 1970-01-01 01:00:00.000000000 +0100 +++ wrapper_3.5.25_src/src/c/Makefile-linux-s390x-64.make 2014-08-04 10:35:31.250225886 +0200 @@ -0,0 +1,54 @@ +# Copyright (c) 1999, 2014 Tanuki Software, Ltd. +# http://www.tanukisoftware.com +# All rights reserved. +# +# This software is the proprietary information of Tanuki Software. +# You shall use it only in accordance with the terms of the +# license agreement you entered into with Tanuki Software. +# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html + +COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE + +INCLUDE=$(JAVA_HOME)/include + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + +wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o + +testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +BIN = ../../bin +LIB = ../../lib +TEST = ../../test + +all: init wrapper libwrapper.so testsuite + +clean: + rm -f *.o + +cleanall: clean + rm -rf *~ .deps + rm -f $(BIN)/wrapper $(LIB)/libwrapper.so + +init: + if test ! -d .deps; then mkdir .deps; fi + +wrapper: $(wrapper_SOURCE) + $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm + +testsuite: $(testsuite_SOURCE) + $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-s390-32.make wrapper_3.5.25_src/src/c/Makefile-linux-s390-32.make --- wrapper_3.5.25_src.old/src/c/Makefile-linux-s390-32.make 1970-01-01 01:00:00.000000000 +0100 +++ wrapper_3.5.25_src/src/c/Makefile-linux-s390-32.make 2014-08-04 10:34:57.675225890 +0200 @@ -0,0 +1,54 @@ +# Copyright (c) 1999, 2014 Tanuki Software, Ltd. +# http://www.tanukisoftware.com +# All rights reserved. +# +# This software is the proprietary information of Tanuki Software. +# You shall use it only in accordance with the terms of the +# license agreement you entered into with Tanuki Software. +# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html + +COMPILE = gcc -O3 -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE + +INCLUDE=$(JAVA_HOME)/include + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + +wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o + +testsuite_SOURCE = testsuite.c test_example.c test_javaadditionalparam.c test_hashmap.c test_filter.c wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +BIN = ../../bin +LIB = ../../lib +TEST = ../../test + +all: init wrapper libwrapper.so + +clean: + rm -f *.o + +cleanall: clean + rm -rf *~ .deps + rm -f $(BIN)/wrapper $(LIB)/libwrapper.so + +init: + if test ! -d .deps; then mkdir .deps; fi + +wrapper: $(wrapper_SOURCE) + $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm + +testsuite: $(testsuite_SOURCE) + $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-32.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-32.make --- wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-32.make 2014-08-04 10:24:24.467225966 +0200 +++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-32.make 2014-08-04 10:31:00.972225918 +0200 @@ -36,7 +36,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm testsuite: $(testsuite_SOURCE) $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite diff -urN wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-64.make wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make --- wrapper_3.5.25_src.old/src/c/Makefile-linux-x86-64.make 2014-08-04 10:24:24.466225966 +0200 +++ wrapper_3.5.25_src/src/c/Makefile-linux-x86-64.make 2014-08-04 10:31:00.972225918 +0200 @@ -36,7 +36,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper -lm testsuite: $(testsuite_SOURCE) $(COMPILE) -DCUNIT $(testsuite_SOURCE) -lm -pthread -L/usr/local/lib -lncurses -lcunit -o $(TEST)/testsuite ++++++ tanukiwrapper-ppc64le.patch ++++++ diff -urN wrapper_3.5.25_src.old/build.xml wrapper_3.5.25_src/build.xml --- wrapper_3.5.25_src.old/build.xml 2014-08-04 10:24:24.463225966 +0200 +++ wrapper_3.5.25_src/build.xml 2014-08-04 10:39:44.065225856 +0200 @@ -133,6 +133,7 @@ <equals arg1="${os.arch}" arg2="Power"/> <equals arg1="${os.arch}" arg2="PowerPC"/> <equals arg1="${os.arch}" arg2="ppc64"/> + <equals arg1="${os.arch}" arg2="ppc64le"/> </or> </condition> <condition property="dist.arch" value="parisc"> diff -urN wrapper_3.5.25_src.old/src/bin/sh.script.in wrapper_3.5.25_src/src/bin/sh.script.in --- wrapper_3.5.25_src.old/src/bin/sh.script.in 2014-08-04 10:24:24.467225966 +0200 +++ wrapper_3.5.25_src/src/bin/sh.script.in 2014-08-04 10:42:02.583225840 +0200 @@ -347,8 +347,8 @@ DIST_ARCH="mips" DIST_BITS="32" ;; - 'power' | 'powerpc' | 'power_pc' | 'ppc64') - if [ "${DIST_ARCH}" = "ppc64" ] ; then + 'power' | 'powerpc' | 'power_pc' | 'ppc64' | 'ppc64le' ) + if [ "${DIST_ARCH}" = "ppc64" -o "${DIST_ARCH}" = 'ppc64le' ] ; then DIST_BITS="64" else DIST_BITS="32" diff -urN wrapper_3.5.25_src.old/src/java/org/tanukisoftware/wrapper/WrapperManager.java wrapper_3.5.25_src/src/java/org/tanukisoftware/wrapper/WrapperManager.java --- wrapper_3.5.25_src.old/src/java/org/tanukisoftware/wrapper/WrapperManager.java 2014-08-04 10:24:24.464225966 +0200 +++ wrapper_3.5.25_src/src/java/org/tanukisoftware/wrapper/WrapperManager.java 2014-08-04 10:42:47.616225834 +0200 @@ -1408,7 +1408,7 @@ { arch = "sparc"; } - else if ( arch.equals( "power" ) || arch.equals( "powerpc" ) || arch.equals( "ppc64" ) ) + else if ( arch.equals( "power" ) || arch.equals( "powerpc" ) || arch.startsWith( "ppc64" ) ) { arch = "ppc"; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
