From d8c3bd76efdca64a37a1931088e3d898c1a10f61 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Feb 08 2012 15:43:24 +0000
Subject: Merge branch 'master' of ssh://pkgs.fedoraproject.org/ltrace


Conflicts:
	ltrace.spec

---

diff --git a/ltrace.spec b/ltrace.spec
index c0840e5..5077cef 100644
--- a/ltrace.spec
+++ b/ltrace.spec
@@ -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 +86,14 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/ltrace.conf
 
 %changelog
-* Tue Feb  7 2012 Petr Machata <pmachata@redhat.com> - 0.6.0-4
+* Tue Feb  7 2012 Petr Machata <pmachata@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@lists.fedoraproject.org> - 0.6.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Fri Nov 25 2011 Petr Machata <pmachata@redhat.com> - 0.6.0-3
 - Add several upstream patches that fix various races in tracing
   multi-threaded processes