tsocks.spec poprawka (lib64)

[Natalia Dragun]

Witam,

przesylam poprawke na pakiet tsocks dla x86_64.
Problem byl w tym, ze tsocks szukal biblioteki w /usr/lib
niezaleznie od architektury.

-- 
Pozdrawiam,
Natalia
-------------- następna część ---------
--- tsocks	2002-03-16 11:27:18.000000000 +0100
+++ tsocks	2010-04-11 20:37:53.000000000 +0200
@@ -46,14 +46,14 @@
 	on)
 		if [ -z "$LD_PRELOAD" ]
 			then
-				export LD_PRELOAD="/usr/lib/libtsocks.so"
+				export LD_PRELOAD="/usr/@lib@/libtsocks.so"
 			else
-				echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
-				export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
+				echo $LD_PRELOAD | grep -q "/usr/@lib@/libtsocks\.so" || \
+				export LD_PRELOAD="/usr/@lib@/libtsocks.so $LD_PRELOAD"
 		fi
 	;;
 	off)
-		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/lib\/libtsocks.so \?//'`
+		export LD_PRELOAD=`echo -n $LD_PRELOAD | sed 's/\/usr\/@lib@\/libtsocks.so \?//'`
 		if [ -z "$LD_PRELOAD" ]
 			then
 				unset LD_PRELOAD
@@ -68,10 +68,10 @@
 	*)
 		if [ -z "$LD_PRELOAD" ]
 		then
-			export LD_PRELOAD="/usr/lib/libtsocks.so"
+			export LD_PRELOAD="/usr/@lib@/libtsocks.so"
 		else
-			echo $LD_PRELOAD | grep -q "/usr/lib/libtsocks\.so" || \
-			export LD_PRELOAD="/usr/lib/libtsocks.so $LD_PRELOAD"
+			echo $LD_PRELOAD | grep -q "/usr/@lib@/libtsocks\.so" || \
+			export LD_PRELOAD="/usr/@lib@/libtsocks.so $LD_PRELOAD"
 		fi
 
 		if [ $# = 0 ]
-------------- następna część ---------
? .cvsignore
? tsocks-lib64.patch
? tsocks.spec.patch
Index: tsocks.spec
===================================================================
RCS file: /cvsroot/packages/tsocks/tsocks.spec,v
retrieving revision 1.8
diff -u -r1.8 tsocks.spec
--- tsocks.spec	20 Sep 2008 09:34:31 -0000	1.8
+++ tsocks.spec	11 Apr 2010 19:06:17 -0000
@@ -8,11 +8,12 @@
 Name:		tsocks
 Version:	1.8
 %define	_beta	beta5
-Release:	0.%{_beta}.2
+Release:	0.%{_beta}.3
 License:	GPL v2
 Group:		Networking/Utilities
 Source0:	http://ftp1.sourceforge.net/tsocks/%{name}-%{version}%{_beta}.tar.gz
 # Source0-md5:	51caefd77e5d440d0bbd6443db4fc0f8
+Patch0:		%{name}-lib64.patch
 URL:		http://tsocks.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -47,6 +48,8 @@
 
 %prep
 %setup -q
+%patch0 -p0
+%{__sed} -i 's#@lib@#%{_lib}#g' tsocks
 
 %build
 %{__aclocal}