From cc2bc6c5066e98b18a1235007d7f079f6c1f46f0 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Jan 14 2014 15:06:35 +0000
Subject: Man page nits


---

diff --git a/ltrace-0.7.91-man.patch b/ltrace-0.7.91-man.patch
new file mode 100644
index 0000000..d7a7dbf
--- /dev/null
+++ b/ltrace-0.7.91-man.patch
@@ -0,0 +1,45 @@
+diff -up ltrace-0.7.91/options.c\~ ltrace-0.7.91/options.c
+--- ltrace-0.7.91/options.c~	2013-10-22 11:54:21.000000000 +0200
++++ ltrace-0.7.91/options.c	2014-01-13 15:38:51.362221740 +0100
+@@ -128,6 +128,8 @@ usage_debug(void) {
+ 			"\n"
+ 			"Debugging options are mixed using bitwise-or.\n"
+ 			"Note that the meanings and values are subject to change.\n"
++			"Also note that these values are used inconsistently in ltrace, and the\n"
++			"only debuglevel that you can rely on is -D77 that will show everything.\n"
+ 		   );
+ }
+ 
+diff -up ltrace-0.7.91/ltrace.1\~ ltrace-0.7.91/ltrace.1
+--- ltrace-0.7.91/ltrace.1~	2013-10-23 17:44:13.000000000 +0200
++++ ltrace-0.7.91/ltrace.1	2014-01-13 15:51:24.236730677 +0100
+@@ -1,5 +1,5 @@
+ .\" -*-nroff-*-
+-.\" Copyright (c) 2012, 2013 Petr Machata, Red Hat Inc.
++.\" Copyright (c) 2012,2013,2014 Petr Machata, Red Hat Inc.
+ .\" Copyright (c) 1997-2005 Juan Cespedes <cespedes@debian.org>
+ .\"
+ .\" This program is free software; you can redistribute it and/or
+@@ -118,9 +118,9 @@ Besides removing any initial underscore 
+ this makes C++ function names readable.
+ .IP "\-D, \-\-debug \fRmask\fI"
+ Show debugging output of \fBltrace\fR itself.  \fImask\fR is a number
+-with internal meaning that's not really well defined at all.
+-\fImask\fR of 77 shows all debug messages, which is what you usually
+-need.
++describing which debug messages should be displayed.  Use the option
++\-Dh to see what can be used, but note that currently the only
++reliable debugmask is 77, which shows all debug messages.
+ .IP "\-e \fIfilter"
+ A qualifying expression which modifies which library calls to trace.
+ The format of the filter expression is described in the section
+@@ -156,7 +156,8 @@ dependency ordering.  If you want to mak
+ library are actually called, use \fB-x @\fIlibrary_pattern\fR instead.
+ .IP \-L
+ When no -e option is given, don't assume the default action of
+-\fB@MAIN\fR.
++\fB@MAIN\fR.  In practice this means that library calls will not be
++traced.
+ .IP "\-n, \-\-indent \fInr"
+ Indent trace output by \fInr\fR spaces for each level of call
+ nesting. Using this option makes the program flow visualization easy
diff --git a/ltrace.spec b/ltrace.spec
index 15b00dc..733a554 100644
--- a/ltrace.spec
+++ b/ltrace.spec
@@ -1,7 +1,7 @@
 Summary: Tracks runtime library calls from dynamically linked executables
 Name: ltrace
 Version: 0.7.91
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://ltrace.alioth.debian.org/
 License: GPLv2+
 Group: Development/Debuggers
@@ -30,6 +30,9 @@ Patch2: ltrace-0.7.91-ppc64-fork.patch
 Patch3: ltrace-0.7.91-breakpoint-on_install.patch
 Patch4: ltrace-0.7.91-ppc64-unprelink.patch
 
+# Man page nits.  Backport of an upstream patch.
+Patch5: ltrace-0.7.91-man.patch
+
 %description
 Ltrace is a debugging program which runs a specified command until the
 command exits.  While the command is executing, ltrace intercepts and
@@ -47,6 +50,7 @@ execution of processes.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
@@ -71,6 +75,9 @@ echo ====================TESTING END=====================
 %{_datadir}/ltrace
 
 %changelog
+* Tue Jan 14 2014 Petr Machata <pmachata@redhat.com> - 0.7.91-5
+- Fix a couple nits in ltrace.1 (ltrace-0.7.91-man.patch)
+
 * Fri Jan 10 2014 Petr Machata <pmachata@redhat.com> - 0.7.91-4
 - Fix crashing a prelinked PPC64 binary which makes PLT calls through
   slots that ltrace doesn't trace.