Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 595936 Details for
Bug 837293
Update to 3.5.14
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Update to 3.5.14
0001-Update-to-3.5.14.patch (text/plain), 21.66 KB, created by
gil cattaneo
on 2012-07-03 11:38:17 UTC
(
hide
)
Description:
Update to 3.5.14
Filename:
MIME Type:
Creator:
gil cattaneo
Created:
2012-07-03 11:38:17 UTC
Size:
21.66 KB
patch
obsolete
>From b17a80c919411d43f08c679481e3f4ce56e888e9 Mon Sep 17 00:00:00 2001 >From: gil <puntogil@libero.it> >Date: Tue, 3 Jul 2012 11:22:54 +0200 >Subject: [PATCH] Update to 3.5.14 > >--- > .gitignore | 1 + > java-service-wrapper.spec | 182 +++++++++++--------- > sources | 3 +- > tanukiwrapper-3.2.3-build.patch | 16 ++ > tanukiwrapper-3.5.14-Makefile-linux-ia-64.patch | 11 ++ > tanukiwrapper-3.5.14-Makefile-linux-ppc-32.patch | 11 ++ > tanukiwrapper-3.5.14-Makefile-linux-ppc-64.patch | 11 ++ > ...iwrapper-3.5.14-Makefile-linux-s390-s390x.patch | 86 +++++++++ > tanukiwrapper-3.5.14-Makefile-linux-x86-32.patch | 11 ++ > tanukiwrapper-3.5.14-Makefile-linux-x86-64.patch | 20 ++ > tanukiwrapper-3.5.14-jdoc.patch | 42 +++++ > tanukiwrapper-3.5.14-jnilibpath.patch | 11 ++ > tanukiwrapper-template.pom | 19 ++ > 13 files changed, 342 insertions(+), 82 deletions(-) > create mode 100644 tanukiwrapper-3.2.3-build.patch > create mode 100644 tanukiwrapper-3.5.14-Makefile-linux-ia-64.patch > create mode 100644 tanukiwrapper-3.5.14-Makefile-linux-ppc-32.patch > create mode 100644 tanukiwrapper-3.5.14-Makefile-linux-ppc-64.patch > create mode 100644 tanukiwrapper-3.5.14-Makefile-linux-s390-s390x.patch > create mode 100644 tanukiwrapper-3.5.14-Makefile-linux-x86-32.patch > create mode 100644 tanukiwrapper-3.5.14-Makefile-linux-x86-64.patch > create mode 100644 tanukiwrapper-3.5.14-jdoc.patch > create mode 100644 tanukiwrapper-3.5.14-jnilibpath.patch > create mode 100644 tanukiwrapper-template.pom > >diff --git a/.gitignore b/.gitignore >index a4f1090..0f5311c 100644 >--- a/.gitignore >+++ b/.gitignore >@@ -1,2 +1,3 @@ > /java-service-wrapper-3.2.5-docs.tar.bz2 > /release-3_2_5.tar.bz2 >+/wrapper_3.5.14_src.tar.gz >diff --git a/java-service-wrapper.spec b/java-service-wrapper.spec >index 3762b67..0809fe6 100644 >--- a/java-service-wrapper.spec >+++ b/java-service-wrapper.spec >@@ -1,119 +1,141 @@ > %global javaver 1.5 >-%global hgrev f24e5cb9a234 > >- >-# rpmbuild < 4.6 support >-%if ! 0%{?__isa_bits} > %ifarch x86_64 ia64 ppc64 sparc64 s390x alpha > %global __isa_bits 64 > %else > %global __isa_bits 32 > %endif >-%endif > > %global __provides_exclude_from ^%{_libdir}/%{name}/.*\.so$ > >-# Whether to build docs too - by default this is not done as Cocoon is not >-# available in Fedora. Instead we ship a prebuilt archive of the docs >-# (the doc/english dir). >-%bcond_with docs >-%global cocoon cocoon-2.0.4 >- >-Name: java-service-wrapper >-Version: 3.2.5 >-Release: 7%{?dist} >-Summary: Java service wrapper >- >-Group: Applications/System >-License: BSD >-URL: https://bitbucket.org/ivertex/java-service-wrapper >-Source0: https://bitbucket.org/ivertex/java-service-wrapper/get/release-3_2_5.tar.bz2 >-Source1: %{name}.template.init >-# this tar has been generated using --with-docs >-Source2: %{name}-%{version}-docs.tar.bz2 >-%if %{with docs} >-Source3: http://archive.apache.org/dist/cocoon/BINARIES/%{cocoon}-bin.tar.gz >-%endif >-Patch0: %{name}-3.2.4-cflags.patch >-Patch1: %{name}-3.2.4-jnilibpath.patch >-Patch2: %{name}-3.2.4-docbuild.patch >-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) >- >-BuildRequires: ant-junit >-BuildRequires: ant-nodeps >-BuildRequires: java-devel-openjdk >= %{javaver} >-BuildRequires: java-javadoc >= %{javaver} >-Requires: java >= %{javaver} >-ExcludeArch: ppc ppc64 >+Name: java-service-wrapper >+Version: 3.5.14 >+Release: 1%{?dist} >+Summary: Java Service Wrapper >+Group: Applications/System >+License: BSD >+URL: http://wrapper.tanukisoftware.com/ >+Source0: http://wrapper.tanukisoftware.org/download/%{version}/wrapper_%{version}_src.tar.gz >+Source1: tanukiwrapper-template.pom >+Patch0: tanukiwrapper-3.2.3-build.patch >+Patch1: tanukiwrapper-%{version}-jdoc.patch >+Patch2: tanukiwrapper-%{version}-Makefile-linux-x86-32.patch >+Patch3: tanukiwrapper-%{version}-Makefile-linux-x86-64.patch >+Patch4: tanukiwrapper-%{version}-Makefile-linux-ppc-32.patch >+Patch5: tanukiwrapper-%{version}-Makefile-linux-ppc-64.patch >+Patch6: tanukiwrapper-%{version}-Makefile-linux-s390-s390x.patch >+Patch7: tanukiwrapper-%{version}-Makefile-linux-ia-64.patch >+Patch8: tanukiwrapper-%{version}-jnilibpath.patch >+ >+BuildRequires: java-devel-openjdk >= %{javaver} >+BuildRequires: jpackage-utils >+ >+BuildRequires: ant >+BuildRequires: ant-junit >+BuildRequires: glibc-devel >+BuildRequires: java-javadoc >= %{javaver} >+BuildRequires: xerces-j2 >+BuildRequires: xml-commons-apis >+ >+Requires: java >= %{javaver} >+Requires: jpackage-utils >+ExcludeArch: ppc ppc64 > > %description >-The Java Service Wrapper enables a Java application to be run as a >-Unix daemon. It also monitors the health of your application and JVM. >- >-%package javadoc >-Summary: Javadoc API documentation for %{name} >-Group: Documentation >-Requires: jpackage-utils >+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 >+Group: Documentation >+Summary: Javadoc for %{name} >+Requires: jpackage-utils > %if 0%{?fedora} || 0%{?rhel} > 5 > BuildArch: noarch > %endif > >-%description javadoc >-Javadoc API documentation for %{name}. >- >+%description javadoc >+This package contains javadoc for %{name}. > > %prep >-%setup -q -n ivertex-%{name}-%{hgrev} -a 2 >-install -pm 644 %{SOURCE1} doc/template.init >+%setup -q -n wrapper_%{version}_src > %patch0 -p1 >-sed -e 's|@LIBPATH@|%{_libdir}/%{name}|' %{PATCH1} | %{__patch} -p1 -F 0 >+%patch1 -p0 > %patch2 -p0 >-%if %{with docs} >-mkdir tools ; cd tools >-%{__tar} xf %{SOURCE3} >-%{__unzip} -q %{cocoon}/cocoon.war ; mv WEB-INF/lib %{cocoon}/ >-cd .. >-%endif >- >+%patch3 -p0 >+%patch4 -p0 >+%patch5 -p0 >+%patch6 -p1 >+%patch7 -p0 >+%patch8 -p0 >+sed -i 's|@LIBPATH@|%{_libdir}/%{name}|' src/java/org/tanukisoftware/wrapper/WrapperManager.java >+ >+perl -p -i -e 's/\r//' doc/AUTHORS >+ >+perl -p -e \ >+ 's|=\.\./lib/wrapper\.jar$|=%{_javadir}/wrapper.jar| ; >+ s|=\.\./lib$|=%{_libdir}/%{name}|' \ >+ 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 >-%ant -Dbits=%{__isa_bits} -Djavac.target.version=%{javaver} >-%javadoc -sourcepath src/java -d javadoc -link %{_javadocdir}/java -author \ >- -windowtitle "Java Service Wrapper API" -doctitle "Java Service Wrapper" \ >- -version $(find src/java -name "*.java" -not -path "*/test/*") >-%if %{with docs} >-rm -r doc/english >-%ant -Dbits=%{__isa_bits} doc >-%endif > >+export CLASSPATH=$(build-classpath junit xerces-j2 xml-commons-apis ant) >+%ant \ >+ -Dbuild.sysclasspath=first \ >+ -Djdk.api=%{_javadocdir}/java \ >+ -Dbits=%{__isa_bits} \ >+ -Djavac.target.version=%{javaver} \ >+ main jdoc > > %install >-rm -rf $RPM_BUILD_ROOT > >-install -Dpm 755 bin/wrapper $RPM_BUILD_ROOT%{_sbindir}/java-service-wrapper >+mkdir -p %{buildroot}%{_javadir} >+install -pm 644 lib/wrapper.jar %{buildroot}%{_javadir}/wrapper.jar >+install -pm 644 lib/wrapperdemo.jar %{buildroot}%{_javadir}/wrapperdemo.jar > >-install -dm 755 $RPM_BUILD_ROOT%{_libdir}/%{name} >-install -pm 755 lib/libwrapper.so $RPM_BUILD_ROOT%{_libdir}/%{name} >-install -pm 644 lib/wrapper.jar $RPM_BUILD_ROOT%{_libdir}/%{name} >- >-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir} >-cp -pR javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name} >+mkdir -p %{buildroot}%{_mavenpomdir} >+install -pm 644 %SOURCE1 %{buildroot}%{_mavenpomdir}/JPP-wrapper.pom >+sed -i "s|<version>@VERSION@|<version>%{version}|" %{buildroot}%{_mavenpomdir}/JPP-wrapper.pom >+%add_maven_depmap JPP-wrapper.pom wrapper.jar -a "com.tanukisoftware:wrapper-linux" > >+mkdir -p %{buildroot}%{_libdir}/%{name} >+install -pm 755 lib/libwrapper.so %{buildroot}%{_libdir}/%{name}/ > >-%clean >-rm -rf $RPM_BUILD_ROOT >+mkdir -p %{buildroot}%{_sbindir} >+install -pm 755 bin/wrapper %{buildroot}%{_sbindir}/%{name} > >+mkdir -p %{buildroot}%{_javadocdir}/%{name} >+cp -a jdoc/* %{buildroot}%{_javadocdir}/%{name} > > %files >-%doc AboutThisRepository.txt doc/ >-%{_sbindir}/java-service-wrapper >-%{_libdir}/%{name}/ >+%{_libdir}/%{name}/*.so >+%{_sbindir}/%{name} >+%{_javadir}/wrapper*.jar >+%{_mavenpomdir}/JPP-wrapper.pom >+%{_mavendepmapfragdir}/%{name} >+%doc doc/*license*.txt *.sample README*.txt > > %files javadoc > %{_javadocdir}/%{name} >- >+%doc doc/*license*.txt > > %changelog >+* Wed May 02 2012 gil cattaneo <puntogil@libero.it> 3.5.14-1 >+- update to 3.5.14 >+- remove cocoon package >+- adapt to current guideline >+ > * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-7 > - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild > >@@ -141,4 +163,4 @@ rm -rf $RPM_BUILD_ROOT > - apply patch1 in way, which does not confuse rpmlint > > * Fri May 20 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.2.4-1.20100928hg637f7cc19e33 >-- Complete rework of the old Fedora tanukiwrapper package. >+- Complete rework of the old Fedora tanukiwrapper package. >\ No newline at end of file >diff --git a/sources b/sources >index d349cde..7bef682 100644 >--- a/sources >+++ b/sources >@@ -1,2 +1 @@ >-b7241ff4609cd9b6bef1bc63070d739a java-service-wrapper-3.2.5-docs.tar.bz2 >-d01d88c219a47eae0d37f6625c67b328 release-3_2_5.tar.bz2 >+1852456e19cb472160f5c1498f2d0ea3 wrapper_3.5.14_src.tar.gz >diff --git a/tanukiwrapper-3.2.3-build.patch b/tanukiwrapper-3.2.3-build.patch >new file mode 100644 >index 0000000..09f5b89 >--- /dev/null >+++ b/tanukiwrapper-3.2.3-build.patch >@@ -0,0 +1,16 @@ >+--- wrapper_3.2.3_src/build.xml 2006-10-17 16:21:20.000000000 +0200 >++++ wrapper_3.2.3_src/build.xml-gil 2009-05-16 18:01:46.000000000 +0200 >+@@ -348,11 +348,13 @@ >+ <!-- Converts natively encoded src files to ascii --> >+ <!-- =================================================================== --> >+ <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" >+ dest="${src.dir}/java" >+ encoding="JISAutoDetect" >+ ext="native" >+ includes="**/*.native" /> >++ --> >+ </target> >+ >+ <!-- =================================================================== --> >diff --git a/tanukiwrapper-3.5.14-Makefile-linux-ia-64.patch b/tanukiwrapper-3.5.14-Makefile-linux-ia-64.patch >new file mode 100644 >index 0000000..eeb26d3 >--- /dev/null >+++ b/tanukiwrapper-3.5.14-Makefile-linux-ia-64.patch >@@ -0,0 +1,11 @@ >+--- src/c/Makefile-linux-ia-64.make 2012-02-08 09:14:51.000000000 +0100 >++++ src/c/Makefile-linux-ia-64.make-gil 2012-05-02 15:03:21.804911700 +0200 >+@@ -7,7 +7,7 @@ >+ # 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 >++COMPILE = gcc ${RPM_OPT_FLAGS} -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE >+ >+ INCLUDE=$(JAVA_HOME)/include >+ >diff --git a/tanukiwrapper-3.5.14-Makefile-linux-ppc-32.patch b/tanukiwrapper-3.5.14-Makefile-linux-ppc-32.patch >new file mode 100644 >index 0000000..dbf7f99 >--- /dev/null >+++ b/tanukiwrapper-3.5.14-Makefile-linux-ppc-32.patch >@@ -0,0 +1,11 @@ >+--- src/c/Makefile-linux-ppc-32.make 2012-02-08 09:14:51.000000000 +0100 >++++ src/c/Makefile-linux-ppc-32.make-gil 2012-05-02 14:42:46.162844231 +0200 >+@@ -7,7 +7,7 @@ >+ # 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 >++COMPILE = gcc ${RPM_OPT_FLAGS} -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE >+ >+ INCLUDE=$(JAVA_HOME)/include >+ >diff --git a/tanukiwrapper-3.5.14-Makefile-linux-ppc-64.patch b/tanukiwrapper-3.5.14-Makefile-linux-ppc-64.patch >new file mode 100644 >index 0000000..4fadd46 >--- /dev/null >+++ b/tanukiwrapper-3.5.14-Makefile-linux-ppc-64.patch >@@ -0,0 +1,11 @@ >+--- src/c/Makefile-linux-ppc-64.make 2012-02-08 09:14:51.000000000 +0100 >++++ src/c/Makefile-linux-ppc-64.make-gil 2012-05-02 14:45:15.864852406 +0200 >+@@ -7,7 +7,7 @@ >+ # license agreement you entered into with Tanuki Software. >+ # http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html >+ >+-COMPILE = gcc -O3 -m64 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE >++COMPILE = gcc ${RPM_OPT_FLAGS} -m64 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE >+ >+ INCLUDE=$(JAVA_HOME)/include >+ >diff --git a/tanukiwrapper-3.5.14-Makefile-linux-s390-s390x.patch b/tanukiwrapper-3.5.14-Makefile-linux-s390-s390x.patch >new file mode 100644 >index 0000000..a99b9ac >--- /dev/null >+++ b/tanukiwrapper-3.5.14-Makefile-linux-s390-s390x.patch >@@ -0,0 +1,86 @@ >+diff -Nru wrapper_3.5.14_src/src/c/Makefile-linux-s390-32.make wrapper_3.5.14_src-gil/src/c/Makefile-linux-s390-32.make >+--- wrapper_3.5.14_src/src/c/Makefile-linux-s390-32.make 1970-01-01 01:00:00.000000000 +0100 >++++ wrapper_3.5.14_src-gil/src/c/Makefile-linux-s390-32.make 2012-05-02 14:59:15.408898246 +0200 >+@@ -0,0 +1,39 @@ >++COMPILE = gcc ${RPM_OPT_FLAGS} -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 >+diff -Nru wrapper_3.5.14_src/src/c/Makefile-linux-s390x-64.make wrapper_3.5.14_src-gil/src/c/Makefile-linux-s390x-64.make >+--- wrapper_3.5.14_src/src/c/Makefile-linux-s390x-64.make 1970-01-01 01:00:00.000000000 +0100 >++++ wrapper_3.5.14_src-gil/src/c/Makefile-linux-s390x-64.make 2012-05-02 14:52:39.620876636 +0200 >+@@ -0,0 +1,39 @@ >++COMPILE = gcc ${RPM_OPT_FLAGS} -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 >diff --git a/tanukiwrapper-3.5.14-Makefile-linux-x86-32.patch b/tanukiwrapper-3.5.14-Makefile-linux-x86-32.patch >new file mode 100644 >index 0000000..e5c945a >--- /dev/null >+++ b/tanukiwrapper-3.5.14-Makefile-linux-x86-32.patch >@@ -0,0 +1,11 @@ >+--- src/c/Makefile-linux-x86-32.make 2012-02-08 09:14:51.000000000 +0100 >++++ src/c/Makefile-linux-x86-32.make-gil 2012-05-02 14:13:08.721747180 +0200 >+@@ -7,7 +7,7 @@ >+ # 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 >++COMPILE = gcc ${RPM_OPT_FLAGS} -fPIC -Wall --pedantic -DLINUX -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE >+ >+ INCLUDE=$(JAVA_HOME)/include >+ >diff --git a/tanukiwrapper-3.5.14-Makefile-linux-x86-64.patch b/tanukiwrapper-3.5.14-Makefile-linux-x86-64.patch >new file mode 100644 >index 0000000..25f2e07 >--- /dev/null >+++ b/tanukiwrapper-3.5.14-Makefile-linux-x86-64.patch >@@ -0,0 +1,20 @@ >+--- src/c/Makefile-linux-x86-64.make 2012-02-08 09:14:51.000000000 +0100 >++++ src/c/Makefile-linux-x86-64.make-gil 2012-05-02 14:17:53.264762716 +0200 >+@@ -7,7 +7,7 @@ >+ # 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 >++COMPILE = gcc ${RPM_OPT_FLAGS} -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE >+ >+ INCLUDE=$(JAVA_HOME)/include >+ >+@@ -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 --git a/tanukiwrapper-3.5.14-jdoc.patch b/tanukiwrapper-3.5.14-jdoc.patch >new file mode 100644 >index 0000000..1ea142a >--- /dev/null >+++ b/tanukiwrapper-3.5.14-jdoc.patch >@@ -0,0 +1,42 @@ >+--- build.xml 2012-05-02 14:35:18.411819783 +0200 >++++ build.xml-gil 2012-05-02 14:35:31.534820500 +0200 >+@@ -12,6 +12,7 @@ >+ <property file="${basedir}/default.properties"/> >+ >+ <!-- 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"/> >+ <property name="cocoon.dist.version" value="2.0.4"/> >+@@ -976,6 +977,31 @@ >+ </target> >+ >+ <!-- =================================================================== --> >++ <!-- Creates the javadocs archive --> >++ <!-- =================================================================== --> >++ <target name="jdoc" description="generates the Wrapper javadocs"> >++ <mkdir dir="${jdoc.dir}"/> >++ <tstamp> >++ <format property="year" pattern="yyyy" /> >++ </tstamp> >++ <!-- Locale must be before any doclet parameters --> >++ <javadoc >++ packagenames="*" >++ excludepackagenames="com.*, org.tanukisoftware.wrapper.test.*, org.tanukisoftware.wrapper.test2.*" >++ Locale="en_US" >++ sourcepath="${src.dir}/java" >++ destdir="${jdoc.dir}" >++ author="true" >++ version="true" >++ private="false" >++ use="true" >++ windowtitle="Java Service Wrapper API" >++ doctitle="Java Service Wrapper" >++ bottom="Copyright 1999, ${year} Tanuki Software Inc., All Rights Reserved." >++ /> >++ </target> >++ >++ <!-- =================================================================== --> >+ <!-- Main target --> >+ <!-- =================================================================== --> >+ <target name="main" >diff --git a/tanukiwrapper-3.5.14-jnilibpath.patch b/tanukiwrapper-3.5.14-jnilibpath.patch >new file mode 100644 >index 0000000..0b3564b >--- /dev/null >+++ b/tanukiwrapper-3.5.14-jnilibpath.patch >@@ -0,0 +1,11 @@ >+--- src/java/org/tanukisoftware/wrapper/WrapperManager.java 2012-02-08 09:14:53.000000000 +0100 >++++ src/java/org/tanukisoftware/wrapper/WrapperManager.java-gil 2012-05-02 14:22:14.634776988 +0200 >+@@ -1146,7 +1146,7 @@ >+ { >+ try >+ { >+- System.loadLibrary( name ); >++ System.load( new File( "@LIBPATH@", file ).toString() ); >+ >+ if ( m_debug ) >+ { >diff --git a/tanukiwrapper-template.pom b/tanukiwrapper-template.pom >new file mode 100644 >index 0000000..9ac0b94 >--- /dev/null >+++ b/tanukiwrapper-template.pom >@@ -0,0 +1,19 @@ >+<project> >+ <modelVersion>4.0.0</modelVersion> >+ <groupId>tanukisoft</groupId> >+ <artifactId>wrapper</artifactId> >+ <name>Java Service Wrapper</name> >+ <version>@VERSION@</version> >+ <packaging>jar</packaging> >+ <url>http://wrapper.tanukisoftware.org/</url> >+ <licenses> >+ <license> >+ <name>Tanuki Software license</name> >+ <url>http://wrapper.tanukisoftware.org/doc/english/license.html</url> >+ </license> >+ </licenses> >+ <scm> >+ <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/wrapper/</url> >+ </scm> >+</project> >+ >-- >1.7.7.6 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 837293
: 595936