[java-service-wrapper: 5/5] Merge branch 'el6'

[Miroslav Suchý]

commit a2733f09478ceeaec08d4d9025130cfe0385a8cb
Merge: c563ede bf0aaa2
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Fri Aug 12 09:08:03 2011 +0200

    Merge branch 'el6'
    
    Conflicts:
    	java-service-wrapper.spec

 java-service-wrapper.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc java-service-wrapper.spec
index 20e3300,f2eb3e6..2a65c9b
--- a/java-service-wrapper.spec
+++ b/java-service-wrapper.spec
@@@ -44,6 -44,8 +44,7 @@@ BuildRequires:  ant-nodep
  BuildRequires:  java-devel-openjdk >= %{javaver}
  BuildRequires:  java-javadoc >= %{javaver}
  Requires:       java >= %{javaver}
 -Obsoletes:      tanukiwrapper <= 3.2.3
+ ExcludeArch:    ppc ppc64
  
  %description
  The Java Service Wrapper enables a Java application to be run as a
@@@ -113,9 -115,10 +114,13 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 +* Fri Aug 12 2011 Miroslav Suchy <msuchy at 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 at redhat.com> - 3.2.5-4
+ - exclude ppc arch
+ - exclude ppc64 arch
+ 
  * Fri Jul 29 2011 Miroslav Suchy <msuchy at redhat.com> - 3.2.5-2
  - 707132 - fix path in jnilibpath.patch