From 07763eb7e7759e3f3e19ca146a62b4742e6d246d Mon Sep 17 00:00:00 2001
From: Levente Farkas <lfarkas@lfarkas.org>
Date: Dec 03 2010 13:52:05 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/jna


Conflicts:
	jna.spec

---

diff --git a/jna.spec b/jna.spec
index 8dc7ce7..2c216a6 100644
--- a/jna.spec
+++ b/jna.spec
@@ -1,6 +1,6 @@
 Name:           jna
 Version:        3.2.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Pure Java access to native libraries
 
 Group:          Development/Libraries
@@ -138,7 +138,7 @@ cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 
 #if 0%{?rhel} >= 6 || 0%{?fedora} >= 9
 %if 0%{?fedora} >= 9
-%ifnarch ppc
+%ifnarch ppc s390 s390x
 %check
 ant -Dcflags_extra.native="%{optflags}" -Ddynlink.native=true -Dnomixedjar.native=true test
 %endif
@@ -182,9 +182,12 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Dec  3 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-9
+* Fri Dec  3 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-10
 - fix pom file name #655810
 
+* Fri Nov  5 2010 Dan Horák <dan[at]danny.cz> - 3.2.7-9
+- exclude checks on s390(x)
+
 * Tue Oct 12 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-8
 - exclude check on ppc