[tsocks/f15] Fix typo and include missing tools

[Jean-Francois Saucier]

commit cf309ec435b7d6453b97e1e61f43d5d2e297e7ba
Author: Jean-Francois Saucier <jsaucier at gmail.com>
Date:   Fri May 13 10:44:54 2011 -0400

    Fix typo and include missing tools

 tsocks.spec                        |   40 +++++++++++++++++++++--------------
 tsocks_fix_man_typo.patch          |   12 ++++++++++
 tsocks_include_missing_tools.patch |   12 ++++++++++
 3 files changed, 48 insertions(+), 16 deletions(-)
---
diff --git a/tsocks.spec b/tsocks.spec
index 7542118..deea4c1 100644
--- a/tsocks.spec
+++ b/tsocks.spec
@@ -1,18 +1,20 @@
-%define		real_version	1.8beta5
-Name:		tsocks
-Version:	1.8
-Release:	0.7.beta5%{?dist}
-Summary:	Library for catching network connections, redirecting them on a SOCKS server
-Group:		System Environment/Libraries
-License:	GPLv2+
-URL:		http://tsocks.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{real_version}.tar.gz
-Patch0:		tsocks_remove_static_lib.patch
-Patch1:		tsocks_fix_lib_path.patch
-Patch2:		tsocks_script_validation_error.patch
-Patch3:		tsocks_documentation_update.patch
-Patch4:		tsocks-1.8-soname.patch
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+%define     real_version    1.8beta5
+Name:       tsocks
+Version:    1.8
+Release:    0.8.beta5%{?dist}
+Summary:    Library for catching network connections, redirecting them on a SOCKS server
+Group:      System Environment/Libraries
+License:    GPLv2+
+URL:        http://tsocks.sourceforge.net/
+Source0:    http://downloads.sourceforge.net/%{name}/%{name}-%{real_version}.tar.gz
+Patch0:     tsocks_remove_static_lib.patch
+Patch1:     tsocks_fix_lib_path.patch
+Patch2:     tsocks_script_validation_error.patch
+Patch3:     tsocks_documentation_update.patch
+Patch4:     tsocks-1.8-soname.patch
+Patch5:     tsocks_fix_man_typo.patch
+Patch6:     tsocks_include_missing_tools.patch
+BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 tsocks is designed for use in machines which are firewalled from the
@@ -35,7 +37,9 @@ program.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1 -b .soname
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %configure
@@ -60,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri May 13 2011 Jean-Francois Saucier <jsaucier at gmail.com> - 1.8-0.8.beta5
+- Fix a typo in the man page
+- Include the missing tools inspectsocks and validateconf
+
 * Thu Feb 17 2011 Rex Dieter <rdieter at fedoraproject.org> 1.8-0.7.beta5
 - avoid odd rpm dep mismatches by explictly specifying a soname for libtsocks
 
diff --git a/tsocks_fix_man_typo.patch b/tsocks_fix_man_typo.patch
new file mode 100644
index 0000000..2ee1da3
--- /dev/null
+++ b/tsocks_fix_man_typo.patch
@@ -0,0 +1,12 @@
+diff -up tsocks-1.8/tsocks.8.orig tsocks-1.8/tsocks.8
+--- tsocks-1.8/tsocks.8.orig	2011-05-13 08:50:34.180906019 -0400
++++ tsocks-1.8/tsocks.8	2011-05-13 08:50:41.001906008 -0400
+@@ -59,7 +59,7 @@ Some configuration options can be specif
+ variables as follows: 
+ 
+ .TP
+-.I TSOCKS_CONFFILE
++.I TSOCKS_CONF_FILE
+ This environment variable overrides the default location of the tsocks 
+ configuration file. This variable is not honored if the program tsocks
+ is embedded in is setuid. In addition this environment variable can
diff --git a/tsocks_include_missing_tools.patch b/tsocks_include_missing_tools.patch
new file mode 100644
index 0000000..2e0d94d
--- /dev/null
+++ b/tsocks_include_missing_tools.patch
@@ -0,0 +1,12 @@
+diff -up tsocks-1.8/Makefile.in.orig tsocks-1.8/Makefile.in
+--- tsocks-1.8/Makefile.in.orig	2011-05-13 09:46:56.688906007 -0400
++++ tsocks-1.8/Makefile.in	2011-05-13 09:47:11.937906005 -0400
+@@ -64,6 +64,8 @@ install: ${TARGETS} installscript instal
+ installscript:
+ 	${MKINSTALLDIRS} "${DESTDIR}${bindir}"
+ 	${INSTALL} ${SCRIPT} ${DESTDIR}${bindir}
++	${INSTALL} ${INSPECT} ${DESTDIR}${bindir}
++	${INSTALL} ${VALIDATECONF} ${DESTDIR}${bindir}
+ 
+ installlib:
+ 	${MKINSTALLDIRS} "${DESTDIR}${libdir}"