[jna/f12/master: 3/3] Merge branch 'f12/master' of ssh://pkgs.fedoraproject.org/jna into f12

[Levente Farkas]

commit 0d0d86f7334ce6b6f55027e1dc86acfd0ec794e1
Merge: 2c757b8 110bf05
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Fri Oct 8 11:48:57 2010 +0200

    Merge branch 'f12/master' of ssh://pkgs.fedoraproject.org/jna into f12
    
    Conflicts:
    	jna.spec

 jna.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc jna.spec
index 8793ee5,cf7938c..23d8fdc
--- a/jna.spec
+++ b/jna.spec
@@@ -180,12 -176,9 +180,15 @@@ rm -rf %{buildroot
  
  
  %changelog
 +* Fri Oct  8 2010 Levente Farkas <lfarkas at lfarkas.org> - 3.2.7-7
 +- fix excludearch condition
 +
 +* Wed Oct  6 2010 Levente Farkas <lfarkas at lfarkas.org> - 3.2.7-6
 +- readd excludearch for old release fix #548099
 +
+ * Fri Oct 01 2010 Dennis Gilmore <dennis at ausil.us> - 3.2.7-5.1
+ - remove the ExcludeArch it makes no sense
+ 
  * Sun Aug  1 2010 Levente Farkas <lfarkas at lfarkas.org> - 3.2.7-5
  - reenable test and clean up contrib files