From a2733f09478ceeaec08d4d9025130cfe0385a8cb Mon Sep 17 00:00:00 2001
From: Miroslav Suchý <msuchy@redhat.com>
Date: Aug 12 2011 07:08:03 +0000
Subject: Merge branch 'el6'


Conflicts:
	java-service-wrapper.spec

---

diff --git a/java-service-wrapper.spec b/java-service-wrapper.spec
index 20e3300..2a65c9b 100644
--- a/java-service-wrapper.spec
+++ b/java-service-wrapper.spec
@@ -44,6 +44,7 @@ BuildRequires:  ant-nodeps
 BuildRequires:  java-devel-openjdk >= %{javaver}
 BuildRequires:  java-javadoc >= %{javaver}
 Requires:       java >= %{javaver}
+ExcludeArch:    ppc ppc64
 
 %description
 The Java Service Wrapper enables a Java application to be run as a
@@ -116,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Aug 12 2011 Miroslav Suchy <msuchy@redhat.com> - 3.2.5-5
 - do not obsolete of tanukiwrapper as this is not drop in replacement
 
+* Mon Aug  1 2011 Miroslav Suchy <msuchy@redhat.com> - 3.2.5-4
+- exclude ppc arch
+- exclude ppc64 arch
+
 * Fri Jul 29 2011 Miroslav Suchy <msuchy@redhat.com> - 3.2.5-2
 - 707132 - fix path in jnilibpath.patch