[apache-commons-daemon] Update to upstream version 1.0.15

Mikolaj Izdebski mizdebsk at fedoraproject.org
Fri Apr 5 03:17:51 UTC 2013


commit 0c82b124701e41bce7e0b4313503ace6f2a55934
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Apr 5 04:42:04 2013 +0200

    Update to upstream version 1.0.15

 .gitignore                        |    1 +
 0001-execve-path-warning.patch    |   32 --------------------------------
 apache-commons-daemon-ppc64.patch |   24 ------------------------
 apache-commons-daemon-s390x.patch |   28 ----------------------------
 apache-commons-daemon.spec        |   15 +++++++--------
 sources                           |    2 +-
 6 files changed, 9 insertions(+), 93 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8af977e..ee935d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ commons-daemon-1.0.2-src.tar.gz
 /commons-daemon-1.0.11-src.tar.gz
 /commons-daemon-1.0.12-src.tar.gz
 /commons-daemon-1.0.13-src.tar.gz
+/commons-daemon-1.0.15-src.tar.gz
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 76f3f76..c94b6c0 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -3,17 +3,14 @@
 %global short_name  commons-%{base_name}
 
 Name:           apache-%{short_name}
-Version:        1.0.13
-Release:        1%{?dist}
+Version:        1.0.15
+Release:        2%{?dist}
 Summary:        Defines API to support an alternative invocation mechanism
 License:        ASL 2.0
 Group:          Applications/System
 URL:            http://commons.apache.org/%{base_name}
 Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Patch0:         0001-execve-path-warning.patch
 Patch1:         apache-commons-daemon-JAVA_OS.patch
-Patch2:         apache-commons-daemon-s390x.patch
-Patch3:         apache-commons-daemon-ppc64.patch
 BuildRequires:  maven-local
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils
@@ -60,10 +57,7 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 1:1.0.1
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-%patch0 -p1 -b .execve
 %patch1 -p1 -b .java_os
-%patch2 -p1 -b .s390x
-%patch3 -p1 -b .ppc64
 
 # remove java binaries from sources
 rm -rf src/samples/build/
@@ -113,6 +107,11 @@ install -Dpm 644 src/native/unix/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1/jsvc.1
 
 
 %changelog
+* Fri Apr  5 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0.15-1
+- Update to upstream version 1.0.15
+- Remove 0001-execve-path-warning.patch (fixed upstream)
+- Remove patches for s390x and ppc64 (accepted upstream in DAEMON-289)
+
 * Wed Feb 13 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0.13-1
 - Update to upstream version 1.0.13
 
diff --git a/sources b/sources
index 51ae1b7..9277777 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abf519e43e95e8b1f63a45e2568374d6  commons-daemon-1.0.13-src.tar.gz
+e467bc1f332d47ad85d18ea8b8a897c3  commons-daemon-1.0.15-src.tar.gz


More information about the scm-commits mailing list