[apache-commons-daemon] Update to latest upstream (1.0.6)

Stanislav Ochotnicky sochotni at fedoraproject.org
Wed Jul 20 09:19:53 UTC 2011 

commit dc9f7d729b1cfbe9cae03473963e14cba0c599ac
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Jul 20 11:18:00 2011 +0200

    Update to latest upstream (1.0.6)

 .gitignore                     |    1 +
 0001-execve-path-warning.patch |    8 ++++----
 0002-ppc64-configure.patch     |   10 +++++-----
 0003-s390x-configure.patch     |   27 ++++++++++++++++++++-------
 apache-commons-daemon.spec     |   32 +++++++++++---------------------
 sources                        |    2 +-
 6 files changed, 42 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94847a5..e683d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ commons-daemon-1.0.2-src.tar.gz
 /commons-daemon-1.0.3-src.tar.gz
 /commons-daemon-1.0.4-src.tar.gz
 /commons-daemon-1.0.5-src.tar.gz
+/commons-daemon-1.0.6-src.tar.gz
diff --git a/0001-execve-path-warning.patch b/0001-execve-path-warning.patch
index 285f1ae..3a9c4d1 100644
--- a/0001-execve-path-warning.patch
+++ b/0001-execve-path-warning.patch
@@ -1,4 +1,4 @@
-From 3c89eec3132a924721882f38b8ab06ab81ad2ee8 Mon Sep 17 00:00:00 2001
+From 0de57c78cbe1666fdf78ff6522b3b0ce18f12716 Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky at redhat.com>
 Date: Tue, 18 Jan 2011 14:46:21 +0100
 Subject: [PATCH 1/3] execve path warning
@@ -8,10 +8,10 @@ Subject: [PATCH 1/3] execve path warning
  1 files changed, 9 insertions(+), 0 deletions(-)
 
 diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c
-index e3d9e89..72d53c2 100644
+index 1967f09..22967f1 100644
 --- a/src/native/unix/native/jsvc-unix.c
 +++ b/src/native/unix/native/jsvc-unix.c
-@@ -966,6 +966,15 @@ int main(int argc, char *argv[])
+@@ -1015,6 +1015,15 @@ int main(int argc, char *argv[])
          char *tmp = NULL;
          char *p1  = NULL;
          char *p2  = NULL;
@@ -28,5 +28,5 @@ index e3d9e89..72d53c2 100644
          /*
           * There is no need to change LD_LIBRARY_PATH
 -- 
-1.7.3.5
+1.7.6
 
diff --git a/0002-ppc64-configure.patch b/0002-ppc64-configure.patch
index 73aff13..49b1fce 100644
--- a/0002-ppc64-configure.patch
+++ b/0002-ppc64-configure.patch
@@ -1,4 +1,4 @@
-From 371ed8b175a2b7b05b5c9687b2d7fe7880524cb1 Mon Sep 17 00:00:00 2001
+From 5a66ed56d4ec20e0df41d0b06f122264ee5811af Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky at redhat.com>
 Date: Tue, 18 Jan 2011 14:48:05 +0100
 Subject: [PATCH 2/3] ppc64 configure
@@ -9,10 +9,10 @@ Subject: [PATCH 2/3] ppc64 configure
  2 files changed, 13 insertions(+), 4 deletions(-)
 
 diff --git a/src/native/unix/configure b/src/native/unix/configure
-index 3929ce8..62f35d9 100755
+index 64d88bf..1fc9007 100755
 --- a/src/native/unix/configure
 +++ b/src/native/unix/configure
-@@ -2984,7 +2984,10 @@ $as_echo "failed" >&6; }
+@@ -2563,7 +2563,10 @@ echo "$as_me: error: Unsupported operating system \"$host_os\"" >&2;}
      ;;
    esac
    case $host_cpu in
@@ -25,7 +25,7 @@ index 3929ce8..62f35d9 100755
      HOST_CPU=$host_cpu;;
    sparc*)
 diff --git a/src/native/unix/support/config.sub b/src/native/unix/support/config.sub
-index 93a3a14..449f3b1 100755
+index 93a3a14..449f3b1 100644
 --- a/src/native/unix/support/config.sub
 +++ b/src/native/unix/support/config.sub
 @@ -225,7 +225,7 @@ case $basic_machine in
@@ -64,5 +64,5 @@ index 93a3a14..449f3b1 100755
  		basic_machine=powerpcle-unknown
  	        ;;
 -- 
-1.7.3.4
+1.7.6
 
diff --git a/0003-s390x-configure.patch b/0003-s390x-configure.patch
index fd3e480..08cf4f8 100644
--- a/0003-s390x-configure.patch
+++ b/0003-s390x-configure.patch
@@ -1,7 +1,17 @@
-diff -up commons-daemon-1.0.5-src/src/native/unix/configure.s390 commons-daemon-1.0.5-src/src/native/unix/configure
---- commons-daemon-1.0.5-src/src/native/unix/configure.s390	2011-05-04 16:04:10.000000000 +0200
-+++ commons-daemon-1.0.5-src/src/native/unix/configure	2011-05-04 16:12:04.000000000 +0200
-@@ -3030,10 +3030,9 @@ $as_echo "failed" >&6; }
+From a4541056cfa275aabb9c57f0fab1ea93bb94c1f2 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Wed, 20 Jul 2011 11:08:48 +0200
+Subject: [PATCH 3/3] s390x configure
+
+---
+ src/native/unix/configure |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/native/unix/configure b/src/native/unix/configure
+index 1fc9007..15a74c6 100755
+--- a/src/native/unix/configure
++++ b/src/native/unix/configure
+@@ -2609,10 +2609,9 @@ echo "$as_me: error: Unsupported operating system \"$host_os\"" >&2;}
      CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
      supported_os="ia64"
      HOST_CPU=ia64;;
@@ -12,6 +22,9 @@ diff -up commons-daemon-1.0.5-src/src/native/unix/configure.s390 commons-daemon-
 +  s390*)
 +    CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
 +    HOST_CPU=$host_cpu;;
-   *)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
- $as_echo "failed" >&6; }
+   arm*)
+     CFLAGS="$CFLAGS -DCPU=\\\"arm\\\""
+     supported_os="arm"
+-- 
+1.7.6
+
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index ad0071c..2878e1f 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -3,8 +3,8 @@
 %global short_name  commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        1.0.5
-Release:        5%{?dist}
+Version:        1.0.6
+Release:        1%{?dist}
 Summary:        Defines API to support an alternative invocation mechanism
 License:        ASL 2.0
 Group:          Applications/System
@@ -21,8 +21,6 @@ BuildRequires:  xmlto
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 
 # This should go away with F-17
@@ -102,12 +100,9 @@ ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
 
 
 # pom
-install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
+install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
 
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -119,35 +114,30 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt PROPOSAL.html NOTICE.txt RELEASE-NOTES.txt src/samples
 %doc src/docs/*
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_javadir}/%{short_name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 
 %files jsvc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_bindir}/jsvc
 %{_mandir}/man1/jsvc.1*
 
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}
 %doc LICENSE.txt
 
 
 %changelog
+* Wed Jul 20 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0.6-1
+- Update to latest upstream (1.0.6)
+
 * Mon May  9 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0.5-5
 - Use mvn-rpmbuild instead of mvn-local (changes in maven)
 
diff --git a/sources b/sources
index 42bdb26..0993851 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fe0a35d4a9c0338ecd45dad20f33662  commons-daemon-1.0.5-src.tar.gz
+28dc2e0a3634b2dc3605e9e6444d079f  commons-daemon-1.0.6-src.tar.gz

More information about the scm-commits mailing list