- update to 1.0.15

* bugfix release, see RELEASE-NOTES.txt for a list of fixed bugs
- obsoleted patches:
  * 0001-execve-path-warning.patch, already upstream
  * jsvc-libcap-relative.patch, already upstream
  * config-guess-sub-update.patch, already upstream
- don't install pointless filesfor SUSE Linux
- verify package signature on openSUSE 12.3+
- use source urls

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-daemon?expand=0&rev=10

apache-commons-daemon-aarch64.patch

@@ -1,28 +1,30 @@
-Index: commons-daemon-1.0.10-src/src/native/unix/configure
+Index: commons-daemon-1.0.15-src/src/native/unix/configure
 ===================================================================
---- commons-daemon-1.0.10-src.orig/src/native/unix/configure
+--- commons-daemon-1.0.15-src.orig/src/native/unix/configure
-+++ commons-daemon-1.0.10-src/src/native/unix/configure
++++ commons-daemon-1.0.15-src/src/native/unix/configure
-@@ -2682,6 +2682,9 @@ echo "$as_me: error: Unsupported operati
+@@ -2705,6 +2705,10 @@ echo "$as_me: error: Unsupported operati
-     CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
      supported_os="arm"
-     HOST_CPU=arm;;
+     HOST_CPU=arm
+     ;;
 +  aarch64)
 +    CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
-+    HOST_CPU=$host_cpu;;
++    HOST_CPU=$host_cpu
++    ;;
    *)
      echo "$as_me:$LINENO: result: failed" >&5
  echo "${ECHO_T}failed" >&6
-Index: commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4
+Index: commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
 ===================================================================
---- commons-daemon-1.0.10-src.orig/src/native/unix/support/apsupport.m4
+--- commons-daemon-1.0.15-src.orig/src/native/unix/support/apsupport.m4
-+++ commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4
++++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
-@@ -148,6 +148,9 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
+@@ -171,6 +171,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
-     CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
      supported_os="arm"
-     HOST_CPU=arm;;
+     HOST_CPU=arm
+     ;;
 +  aarch64)
 +    CFLAGS="$CFLAGS -DCPU=\\\"aarch64\\\""
-+    HOST_CPU=$host_cpu;;
++    HOST_CPU=$host_cpu
++    ;;
    *)
      AC_MSG_RESULT([failed])
      AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;

apache-commons-daemon-ppc64.patch

@@ -1,8 +1,8 @@
-Index: commons-daemon-1.0.10-src/src/native/unix/configure
+Index: commons-daemon-1.0.15-src/src/native/unix/configure
 ===================================================================
---- commons-daemon-1.0.10-src.orig/src/native/unix/configure
+--- commons-daemon-1.0.15-src.orig/src/native/unix/configure
-+++ commons-daemon-1.0.10-src/src/native/unix/configure
++++ commons-daemon-1.0.15-src/src/native/unix/configure
-@@ -2607,7 +2607,10 @@ echo "$as_me: error: Unsupported operati
+@@ -2610,7 +2610,10 @@ echo "$as_me: error: Unsupported operati
      ;;
    esac
    case $host_cpu in
@@ -12,5 +12,5 @@ Index: commons-daemon-1.0.10-src/src/native/unix/configure
 +    HOST_CPU=$host_cpu;;
 +  ppc*)
      CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
-     HOST_CPU=$host_cpu;;
+     HOST_CPU=$host_cpu
-   sparc*)
+     ;;

apache-commons-daemon-s390x.patch

@@ -1,28 +1,32 @@
-diff -up commons-daemon-1.0.10-src/src/native/unix/configure.s390x commons-daemon-1.0.10-src/src/native/unix/configure
+Index: commons-daemon-1.0.15-src/src/native/unix/configure
---- commons-daemon-1.0.10-src/src/native/unix/configure.s390x	2012-04-23 11:55:56.000000000 +0200
+===================================================================
-+++ commons-daemon-1.0.10-src/src/native/unix/configure	2012-04-23 11:57:18.000000000 +0200
+--- commons-daemon-1.0.15-src.orig/src/native/unix/configure
-@@ -2671,6 +2671,10 @@ echo "$as_me: error: Unsupported operati
++++ commons-daemon-1.0.15-src/src/native/unix/configure
-     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+@@ -2692,6 +2692,11 @@ echo "$as_me: error: Unsupported operati
      supported_os="s390"
-     HOST_CPU=s390;;
+     HOST_CPU=s390
+     ;;
 +  s390x)
 +    CFLAGS="$CFLAGS -DCPU=\\\"s390x\\\""
 +    supported_os="s390x"
-+    HOST_CPU=s390x;;
++    HOST_CPU=s390x
++    ;;
    arm*)
      CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
      supported_os="arm"
-diff -up commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.s390x commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4
+Index: commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
---- commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4.s390x	2012-04-23 11:56:04.000000000 +0200
+===================================================================
-+++ commons-daemon-1.0.10-src/src/native/unix/support/apsupport.m4	2012-04-23 11:56:41.000000000 +0200
+--- commons-daemon-1.0.15-src.orig/src/native/unix/support/apsupport.m4
-@@ -140,6 +140,10 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
++++ commons-daemon-1.0.15-src/src/native/unix/support/apsupport.m4
-     CFLAGS="$CFLAGS -DCPU=\\\"s390\\\""
+@@ -161,6 +161,11 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
      supported_os="s390"
-     HOST_CPU=s390;;
+     HOST_CPU=s390
+     ;;
 +  s390x)
 +    CFLAGS="$CFLAGS -DCPU=\\\"s390x\\\""
 +    supported_os="s390x"
-+    HOST_CPU=s390x;;
++    HOST_CPU=s390x
++    ;;
    arm*)
      CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
      supported_os="arm"

apache-commons-daemon.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu May 16 12:04:08 UTC 2013 - mvyskocil@suse.com
+
+- update to 1.0.15
+  * bugfix release, see RELEASE-NOTES.txt for a list of fixed bugs
+- obsoleted patches:
+  * 0001-execve-path-warning.patch, already upstream
+  * jsvc-libcap-relative.patch, already upstream
+  * config-guess-sub-update.patch, already upstream
+- don't install pointless filesfor SUSE Linux
+- verify package signature on openSUSE 12.3+
+- use source urls
+
 -------------------------------------------------------------------
 Mon Mar 25 23:24:11 UTC 2013 - schwab@suse.de
 

apache-commons-daemon.keyring

@@ -0,0 +1,62 @@
+pub   3072D/0D498E23 2013-01-14
+uid                  Mladen Turk (Default signing key) <mturk@apache.org>
+sub   4096g/DC3D1B18 2013-01-14
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+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
+XDH35tl64G5lNKNum0D8NSGV955R2g==
+=gxY8
+-----END PGP PUBLIC KEY BLOCK-----

apache-commons-daemon.spec

@@ -19,20 +19,19 @@
 %define short_name commons-daemon
 
 Name:           apache-%{short_name}
-Version:        1.0.10
+Version:        1.0.15
 Release:        0
 Summary:        Commons Daemon - Controlling of Java Daemons
 License:        Apache-2.0
 Group:          System/Daemons
 Url:            http://commons.apache.org/daemon/
-Source0:        commons-daemon-%{version}-src.tar.gz
+Source0:        http://www.eu.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
-Patch0:         0001-execve-path-warning.patch
+Source1:        http://www.eu.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz.asc
-Patch1:         apache-commons-daemon-JAVA_OS.patch
+Source2:        apache-commons-daemon.keyring
-Patch2:         apache-commons-daemon-s390x.patch
+Patch0:         apache-commons-daemon-JAVA_OS.patch
-Patch3:         apache-commons-daemon-ppc64.patch
+Patch1:         apache-commons-daemon-s390x.patch
-Patch4:         jsvc-libcap-relative.patch
+Patch2:         apache-commons-daemon-ppc64.patch
-Patch5:         config-guess-sub-update.patch
+Patch3:         apache-commons-daemon-aarch64.patch
-Patch6:         apache-commons-daemon-aarch64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  ant
@@ -41,6 +40,10 @@ BuildRequires:  java-devel
 BuildRequires:  libcap-devel
 BuildRequires:  xmlto
 
+%if 0%{?suse_version} >= 1230
+BuildRequires:  gpg-offline
+%endif
+
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < %{version}
 Provides:       jakarta-%{short_name}-java = %{version}-%{release}
@@ -77,19 +80,22 @@ The Javadoc Documentation for Commons Daemon.
 
 
 %prep
+%if 0%{?suse_version} >= 1230
+%gpg_verify %{SOURCE1}
+%endif
 %setup -q -n %{short_name}-%{version}-src
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5
-%patch6 -p1
 
 # remove java binaries from sources
 rm -rf src/samples/build/
 
-chmod 644 src/samples/*
+# remove files for different OS
+rm -rf src/samples/*.cmd
+
+chmod -R 0644 src/samples/*
 
 %build
 pushd src/native/unix

commons-daemon-1.0.10-src.tar.gz

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

commons-daemon-1.0.15-src.tar.gz

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

commons-daemon-1.0.15-src.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+iF4EABEIAAYFAlFUPW4ACgkQNc0jwQ1JjiMWxAEAow4EYX7KTHNrMLtvwwshV558
+AoaD/Xc1AUq/HKwxhpUBAKO65L16uV0pxihmZuki5e004HPZEHBQsN6Mx8vw8uEA
+=Zwsx
+-----END PGP SIGNATURE-----