Accepting request 390774 from home:dmacvicar:branches:Java:packages

- update to version 3.5.29
- update to version 3.5.28
- removed not longer needed patches
  * tanukiwrapper-no-4g-mem-limit.patch
  * tanukiwrapper-makefile-linux-x86-64.patch
  * tanukiwrapper-makefile-linux-x86-64.patch
- Move from jpackage-utils to javapackages-tools
- aarch64 and ppc64le are 64bit 
- format specfile
- allow more than 4G as -Xmx option (bnc#914900)
  * add tanukiwrapper-no-4g-mem-limit.patch
- License: and Obsoletes: fields fixed 
- x86_64 Makefile fixed
- change rpm groups
- remove BuildRequires on javadoc. It should be part of the
  devel package which is already required.

- rebase on current upstream which builds on s390x

OBS-URL: https://build.opensuse.org/request/show/390774
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tanukiwrapper?expand=0&rev=20

tanukiwrapper.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package tanukiwrapper
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2006, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,25 +18,23 @@
 
 
 Name:           tanukiwrapper
-Version:        3.5.25
-Release:        0
+Version:        3.5.29
+Release:        0.<RELEASE2>
 Summary:        Java Service Wrapper
-License:        MIT
-Group:          Development/Libraries/Java
+License:        GPL-2.0
+Group:          Development/Languages/Java
 Url:            http://wrapper.tanukisoftware.org/
 Source0:        http://download.sourceforge.net/wrapper/wrapper_%{version}_src.tar.gz
-Patch1:         %{name}-build.patch
-Patch3:         %{name}-Makefiles.patch
-Patch7:         tanukiwrapper-ppc64le.patch
+Source1:        wrapper.1
+Patch0:         %{name}-additional-makefiles.patch
 BuildRequires:  ant >= 1.6.1
 BuildRequires:  ant-junit
+BuildRequires:  ant-nodeps >= 1.6.1
 BuildRequires:  cunit-devel
 BuildRequires:  glibc-devel
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  javapackages-tools
-BuildRequires:  junit
 BuildRequires:  perl
-BuildRequires:  unzip
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-apis
 Requires:       javapackages-tools
@@ -54,72 +52,88 @@ common to many Java applications:
 - Ease Application installations
 - Logging
 
+%package javadoc
+Summary:        Javadoc documentation for %{name}
+Group:          Documentation/Other
+# For /bin/rm and /bin/ln
+Requires(post): coreutils
+Requires(postun): coreutils
+
+%description javadoc
+This package contains the javadoc documentation for %{name}
+
 %package manual
-Summary:        Documents for %{name}
+Summary:        Manuals for %{name}
 Group:          Documentation/Other
 
 %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
+This package contains the manuals for %{name}
 
 %prep
 %setup -q -n wrapper_%{version}_src
-%patch1
-%patch3 -p1
-%patch7 -p1
+%patch0 -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*
-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
+rm -f bin/* build/* conf/* lib/* logs/* test/* src/c/*.o src/c/wrapperinfo.c
 
 %build
 export CLASSPATH=$(build-classpath ant junit xerces-j2 xml-commons-apis)
-%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
+%{ant} -Dbuild.sysclasspath=first -Dbits=%{__isa_bits}
+
+%{javadoc} -sourcepath src/java -d build/javadoc org.tanukisoftware.wrapper
 
 %install
+
 # jar
-mkdir -p %{buildroot}%{_javadir}
-install -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}.jar
+%{__mkdir} -p %{buildroot}%{_javadir}
+%{__install} -p -m 0644 lib/wrapper.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
 # jni
-install -d -m 755 %{buildroot}%{_libdir}
-install -p -m 755 lib/libwrapper.so %{buildroot}%{_libdir}
+%{__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}
+%{__install} -d -m 755 %{buildroot}%{_sbindir}
+%{__install} -p -m 755 bin/wrapper %{buildroot}%{_sbindir}/%{name}
+
+# javadoc
+%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -a build/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} # ghost symlink
+
+# manpage
+%{__mkdir_p} %{buildroot}%{_mandir}/man1
+%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1
+
+%check
+%{ant} -Dbuild.sysclasspath=first -Dbits=%{__isa_bits} test
+
+%post javadoc
+rm -rf %{_javadocdir}/%{name}
+%{__ln_s} -f %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
 
 %files
 %defattr(-,root,root,-)
-%doc doc/wrapper-community-license-1.1.txt
+%doc doc/wrapper-community-license-1.3.txt
 %{_sbindir}/%{name}
 %{_libdir}/libwrapper.so
-%{_javadir}/%{name}.jar
+%{_javadir}/%{name}*.jar
+%{_mandir}/man1/%{name}.1.*
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %files manual
 %defattr(0644,root,root,0755)
-%doc doc/wrapper-community-license-1.1.txt *.sample
 %doc doc/*
 
 %changelog