From d2ea7bfa55b51fc73c742bb1e84735e09e7cb32a Mon Sep 17 00:00:00 2001
From: Fabian Deutsch <fabian.deutsch@gmx.de>
Date: Apr 15 2011 08:47:18 +0000
Subject: Merge branch 'f15'


Conflicts:
	orc.spec

Signed-off-by: Fabian Deutsch <fabian.deutsch@gmx.de>

---

diff --git a/orc.spec b/orc.spec
index 8cc6fd8..3337090 100644
--- a/orc.spec
+++ b/orc.spec
@@ -78,7 +78,7 @@ rm -rf %{buildroot}
 
 
 %check
-%ifnarch s390 s390x
+%ifnarch s390 s390x ppc ppc64
 make check
 %endif
 
@@ -117,6 +117,9 @@ make check
 * Fri Apr 15 2011 Fabian Deutsch <fabiand@fedorpaproject.org> - 0.4.12-1
 - Update to 0.4.12, a bug fixing release
 
+* Wed Feb 23 2011 Karsten Hopp <karsten@redhat.com> 0.4.11-3
+- don't run tests on ppc, ppc64
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild