[ltrace/f17: 6/6] fix merge

[Peter Robinson]

commit 45869a8d41fc02e2fa3bd41a88c125d14e749a5e
Merge: 4d003cd e51d038
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Apr 11 21:03:38 2012 +0100

    fix merge

 ltrace.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --cc ltrace.spec
index a1dfd89,f1c92a4..a2ea24f
--- a/ltrace.spec
+++ b/ltrace.spec
@@@ -89,9 -84,15 +84,16 @@@ echo ====================TESTING END===
  %config(noreplace) %{_sysconfdir}/ltrace.conf
  
  %changelog
+ * Wed Apr 11 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.6.0-10
+ - Drop ExclusiveArch as all current Primary/Secondary Arches are supported
+ 
+ * Wed Apr 11 2012 Petr Machata <pmachata at redhat.com> - 0.6.0-9
+ - And patch configure and config.h, not just configure.ac
+ - Resolves: #810973
+ 
  * Wed Apr 11 2012 Petr Machata <pmachata at redhat.com> - 0.6.0-7
- - Add libselinux-devel BR
 +- And patch configure and config.h, not just configure.ac
+ - Add libselinux-devel BR
  - Resolves: #810973
  
  * Tue Apr 10 2012 Petr Machata <pmachata at redhat.com> - 0.6.0-6