[ltrace/f16: 3/3] Merge branch 'master' into f16

[Petr Machata]

commit 2294aefa3e4b67d5e76b70dcac3b3f0ad83fc3c2
Merge: 2be9f97 7e4d565
Author: Petr Machata <pmachata at redhat.com>
Date:   Sat Sep 3 02:02:14 2011 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	ltrace.spec

 ltrace-0.6.0-endian.patch  |  203 ++++
 ltrace-0.6.0-threads.patch | 2797 ++++++++++++++++++++++++++++++++++++++++++++
 ltrace.spec                |   14 +-
 3 files changed, 3011 insertions(+), 3 deletions(-)
---
diff --cc ltrace.spec
index df5b9c5,cf57e98..d96feca
--- a/ltrace.spec
+++ b/ltrace.spec
@@@ -20,7 -20,9 +20,9 @@@ Patch2: ltrace-0.6.0-exec-stripped.patc
  Patch3: ltrace-0.5-demangle.patch
  Patch4: ltrace-0.5-etc-memmove.patch
  Patch5: ltrace-0.6.0-return-string-n.patch
- Patch6: ltrace-0.6.0-testsuite-clone.patch
+ Patch6: ltrace-0.6.0-threads.patch
+ Patch7: ltrace-0.6.0-endian.patch
 -Patch8: ltrace-0.6.0-clone-test.patch
++Patch8: ltrace-0.6.0-testsuite-clone.patch
  
  %description
  Ltrace is a debugging program which runs a specified command until the
@@@ -72,6 -76,10 +76,10 @@@ rm -rf $RPM_BUILD_ROO
  %config(noreplace) %{_sysconfdir}/ltrace.conf
  
  %changelog
+ * Fri Sep  2 2011 Petr Machata <pmachata at redhat.com> - 0.6.0-2
 -- Add upstream patches for tracing multi-threaded processes, endian
 -  fixes, and a test suite fixlet
++- Add upstream patches for tracing multi-threaded processes and endian
++  fixes
+ 
  * Tue Feb 15 2011 Petr Machata <pmachata at redhat.com> - 0.6.0-1
  - Update to 0.6.0
    - Drop most patches