Hello community, here is the log from the commit of package tanukiwrapper for openSUSE:12.2 checked in at 2012-06-26 17:38:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/tanukiwrapper (Old) and /work/SRC/openSUSE:12.2/.tanukiwrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tanukiwrapper", Maintainer is "[email protected]" Changes: -------- New Changes file: --- /dev/null 2012-06-11 00:29:42.179570069 +0200 +++ /work/SRC/openSUSE:12.2/.tanukiwrapper.new/tanukiwrapper.changes 2012-06-26 17:38:21.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 25 09:17:13 UTC 2012 - [email protected] + +- fix a license Tag (MIT), use non-versioned jar and javadoc dir + +------------------------------------------------------------------- +Tue Sep 29 12:39:17 UTC 2009 - [email protected] + +- Initial packaging from jpackage-1.7 + New: ---- tanukiwrapper-Makefile-s390-s390x-ppc.patch tanukiwrapper-build.patch tanukiwrapper-crosslink.patch tanukiwrapper-makefile-linux-x86-32.patch tanukiwrapper.changes tanukiwrapper.spec wrapper_3.2.3_src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tanukiwrapper.spec ++++++ # # spec file for package tanukiwrapper # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2006, JPackage Project # All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define section free Name: tanukiwrapper Version: 3.2.3 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 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 BuildRequires: ant >= 1.6.1 BuildRequires: ant-junit BuildRequires: ant-nodeps >= 1.6.1 BuildRequires: glibc-devel BuildRequires: java-devel BuildRequires: jpackage-utils >= 1.6 BuildRequires: perl BuildRequires: unzip BuildRequires: xerces-j2 BuildRequires: xml-commons-apis Requires: jpackage-utils >= 1.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description 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 javadoc Summary: Javadoc for %{name} Group: Development/Documentation %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: Development/Documentation %description manual 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 %prep %setup -q -n wrapper_%{version}_src %patch1 %patch2 %patch3 %patch4 find . -name "*.jar" -exec %__rm -f {} \; %__perl -p -i -e 's/\r//' doc/AUTHORS %__perl -p -i -e 's|-O3|%optflags|' src/c/Makefile* %__perl -p -e \ 's|=\.\./lib/wrapper\.jar$|=%{_javadir}/%{name}.jar| ; s|=\.\./lib$|=%{_libdir}|' \ src/conf/wrapper.conf.in > wrapper.conf.sample %__perl -p -e \ 's|"\./wrapper"|"%{_sbindir}/%{name}"| ; s|"\.\./conf/wrapper\.conf"|"/path/to/wrapper.conf"|' \ src/bin/sh.script.in > script.sh.sample %build export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis) %ifarch x86_64 ia64 ppc64 sparc64 s390x bits=64 %else bits=32 %endif %ant -Dbuild.sysclasspath=first -Djdk.api=%{_javadocdir}/java -Dbits=$bits \ main jdoc %install %__rm -rf %{buildroot} # jar %__mkdir_p %{buildroot}%{_javadir} %__install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}.jar # jni %__install -d -m 755 %{buildroot}%{_libdir} %__install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir} # commands %__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} %clean %__rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc doc/license.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/* %changelog ++++++ tanukiwrapper-Makefile-s390-s390x-ppc.patch ++++++ --- src/c/Makefile-linux-s390-32.old 1969-12-31 19:00:00.000000000 -0500 +++ src/c/Makefile-linux-s390-32 2006-08-04 16:39:15.000000000 -0400 @@ -0,0 +1,39 @@ +COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables -Wall --pedantic + +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 + +libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o + +BIN = ../../bin +LIB = ../../lib + +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) -o $(BIN)/wrapper -lm + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared -fPIC $(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 --- src/c/Makefile-linux-s390x-64.old 1969-12-31 19:00:00.000000000 -0500 +++ src/c/Makefile-linux-s390x-64 2006-08-04 16:38:53.000000000 -0400 @@ -0,0 +1,39 @@ +COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables -Wall --pedantic + +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 + +libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o + +BIN = ../../bin +LIB = ../../lib + +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) -o $(BIN)/wrapper -lm + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared -fPIC $(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 --- src/c/Makefile-linux-ppc-32.old 1969-12-31 19:00:00.000000000 -0500 +++ src/c/Makefile-linux-ppc-32 2006-08-04 17:43:10.000000000 -0400 @@ -0,0 +1,41 @@ +# This makefile is inprogess. It builds, but the resulting libwrapper.so does not yet work. +# If you know how to fix it then please help out. +COMPILE = gcc -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -fasynchronous-unwind-tables -fPIC --pedantic + +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 + +libwrapper_so_OBJECTS = wrapperjni_unix.o wrapperinfo.o wrapperjni.o + +BIN = ../../bin +LIB = ../../lib + +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 -lm $(wrapper_SOURCE) -o $(BIN)/wrapper + +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 ++++++ tanukiwrapper-build.patch ++++++ --- build.xml~ 2006-03-01 05:34:34.000000000 +0200 +++ build.xml 2006-05-09 11:15:33.000000000 +0300 @@ -294,2 +294,3 @@ <target name="convert" depends="init:msg, init:java-missing"> + <!-- No-op, but prevents build using ant-nodeps built with non-Sun JDK :( <native2ascii src="${src.dir}/java" @@ -299,2 +300,3 @@ includes="**/*.native" /> + --> </target> ++++++ tanukiwrapper-crosslink.patch ++++++ --- build.xml~ 2006-05-09 11:15:33.000000000 +0300 +++ build.xml 2006-05-09 11:18:34.000000000 +0300 @@ -15,3 +15,4 @@ <!-- property name="classpath" value=""/ --> - + <property name="jdk.api" value="http://java.sun.com/j2se/1.5/docs/api/"; /> + <property name="ant.dist.version" value="1.6.2"/> @@ -577,2 +578,3 @@ destdir="${jdoc.dir}" + link="${jdk.api}" author="true" ++++++ tanukiwrapper-makefile-linux-x86-32.patch ++++++ Index: src/c/Makefile-linux-x86-32 =================================================================== --- src/c/Makefile-linux-x86-32.orig 2006-10-17 16:21:14.000000000 +0200 +++ src/c/Makefile-linux-x86-32 2009-09-29 14:46:51.250646072 +0200 @@ -24,7 +24,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + $(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared -fPIC $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so Index: src/c/Makefile-linux-x86-64 =================================================================== --- src/c/Makefile-linux-x86-64.orig 2006-10-17 16:21:14.000000000 +0200 +++ src/c/Makefile-linux-x86-64 2009-09-29 14:55:13.530644493 +0200 @@ -26,7 +26,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper + $(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper -lm libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
