pool/tanukiwrapper
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- Version bump to 3.5.25:

Browse Source 
* 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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tanukiwrapper?expand=0&rev=18
This commit is contained in:
Tomáš Chvátal
2014-08-04 08:49:50 +00:00
committed by Git OBS Bridge
parent d18ea15a1f
commit c473f96f04
10 changed files with 273 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tanukiwrapper-Makefile-aarch64.patch
View File

@@ -1,46 +0,0 @@
Index: wrapper_3.2.3_src/src/c/Makefile-linux-aarch64-64
===================================================================
--- /dev/null
+++ wrapper_3.2.3_src/src/c/Makefile-linux-aarch64-64
@@ -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 -O3 -fPIC -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 $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -lm
+
+%.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

151
tanukiwrapper-Makefile-s390-s390x-ppc.patch
View File

@@ -1,151 +0,0 @@
Index: src/c/Makefile-linux-s390-32
===================================================================
--- /dev/null
+++ src/c/Makefile-linux-s390-32
@@ -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
Index: src/c/Makefile-linux-s390x-64
===================================================================
--- /dev/null
+++ src/c/Makefile-linux-s390x-64
@@ -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
Index: src/c/Makefile-linux-ppc-32
===================================================================
--- /dev/null
+++ src/c/Makefile-linux-ppc-32
@@ -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 $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
+
+libwrapper.so: $(libwrapper_so_OBJECTS)
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -lm
+
+%.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
Index: src/c/Makefile-linux-ppc-64
===================================================================
--- src/c/Makefile-linux-ppc-64.orig
+++ src/c/Makefile-linux-ppc-64
@@ -26,10 +26,10 @@ init:
if test ! -d .deps; then mkdir .deps; fi
wrapper: $(wrapper_SOURCE)
- $(COMPILE) -pthread -lm $(wrapper_SOURCE) -o $(BIN)/wrapper
+ $(COMPILE) -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper -lm
libwrapper.so: $(libwrapper_so_OBJECTS)
- ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
+ ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -lm
%.o: %.c
@echo '$(COMPILE) -c $<'; \

222
tanukiwrapper-Makefiles.patch Normal file
View File

@@ -0,0 +1,222 @@
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

12
tanukiwrapper-crosslink.patch
View File

@@ -1,12 +0,0 @@
--- 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"

26
tanukiwrapper-makefile-linux-x86-32.patch
View File

@@ -1,26 +0,0 @@
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

45
tanukiwrapper-ppc64le.patch
View File

@@ -1,8 +1,7 @@
Index: wrapper_3.2.3_src/build.xml
===================================================================
--- wrapper_3.2.3_src.orig/build.xml
+++ wrapper_3.2.3_src/build.xml
@@ -79,6 +79,7 @@
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"/>
@@ -10,24 +9,24 @@ Index: wrapper_3.2.3_src/build.xml
</or>
</condition>
<condition property="dist.arch" value="parisc">
Index: wrapper_3.2.3_src/src/bin/sh.script.in
===================================================================
--- wrapper_3.2.3_src.orig/src/bin/sh.script.in
+++ wrapper_3.2.3_src/src/bin/sh.script.in
@@ -168,7 +168,7 @@ case "$DIST_ARCH" in
'ip27')
DIST_ARCH="mips"
;;
- 'power' | 'powerpc' | 'power_pc' | 'ppc64')
+ 'power' | 'powerpc' | 'power_pc' | 'ppc64' | 'ppc64le')
DIST_ARCH="ppc"
;;
'pa_risc' | 'pa-risc')
Index: wrapper_3.2.3_src/src/java/org/tanukisoftware/wrapper/WrapperManager.java
===================================================================
--- wrapper_3.2.3_src.orig/src/java/org/tanukisoftware/wrapper/WrapperManager.java
+++ wrapper_3.2.3_src/src/java/org/tanukisoftware/wrapper/WrapperManager.java
@@ -1069,7 +1069,7 @@ public final class WrapperManager
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";
}

18
tanukiwrapper.changes
View File

@@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Aug 4 08:46:11 UTC 2014 - tchvatal@suse.com
- 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 - dvlaeev@suse.com

51
tanukiwrapper.spec
View File

@@ -18,25 +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
@@ -60,22 +54,6 @@ common to many Java applications:
- 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
@@ -95,10 +73,7 @@ common to many Java applications:
%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
@@ -120,10 +95,9 @@ bits=64
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
@@ -136,25 +110,16 @@ install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir}
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

3
wrapper_3.2.3_src.tar.bz2
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf9e192f5b6462d5fba7d91a64cf24aa8a8fa5ba3819b77612d461ea7babc23d
size 3266581

3
wrapper_3.5.25_src.tar.gz Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cbecb7f2101eda82125e3649e3245fc1e7b4b4d6501b479990ea8b18ac6450b
size 556678