[ltrace: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ltrace

[Petr Machata]

commit d8c3bd76efdca64a37a1931088e3d898c1a10f61
Merge: 6e5a20e 2a671a2
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Feb 8 16:43:24 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ltrace
    
    Conflicts:
    	ltrace.spec

 ltrace.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc ltrace.spec
index c0840e5,78cd297..5077cef
--- a/ltrace.spec
+++ b/ltrace.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: Tracks runtime library calls from dynamically linked executables
  Name: ltrace
  Version: 0.6.0
--Release: 4%{?dist}
++Release: 5%{?dist}
  URL: http://ltrace.alioth.debian.org/
  License: GPLv2+
  Group: Development/Debuggers
@@@ -86,11 -84,9 +86,14 @@@ rm -rf $RPM_BUILD_ROO
  %config(noreplace) %{_sysconfdir}/ltrace.conf
  
  %changelog
- * Tue Feb  7 2012 Petr Machata <pmachata at redhat.com> - 0.6.0-4
++* Tue Feb  7 2012 Petr Machata <pmachata at redhat.com> - 0.6.0-5
 +- Add upstream patches for initial breakpoint insertion.  This mostly
 +  fixes tracing on PPC.
 +- Resolves: #773050
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Fri Nov 25 2011 Petr Machata <pmachata at redhat.com> - 0.6.0-3
  - Add several upstream patches that fix various races in tracing
    multi-threaded processes