devel/tn5250 tn5250-0.17.3-multilibconfig.patch, NONE, 1.1 tn5250.spec, 1.32, 1.33

[Karsten Hopp (karsten)]

Author: karsten

Update of /cvs/extras/devel/tn5250
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14368

Modified Files:
	tn5250.spec 
Added Files:
	tn5250-0.17.3-multilibconfig.patch 
Log Message:
- fix multilib problem in /usr/bin/tn5250-config (#343301)

tn5250-0.17.3-multilibconfig.patch:

--- NEW FILE tn5250-0.17.3-multilibconfig.patch ---
diff -up tn5250-0.17.3/tn5250-config.in.multilib tn5250-0.17.3/tn5250-config.in
--- tn5250-0.17.3/tn5250-config.in.multilib	2008-01-15 14:59:27.000000000 +0100
+++ tn5250-0.17.3/tn5250-config.in	2008-01-15 15:17:05.000000000 +0100
@@ -14,7 +14,11 @@ datadir="@datadir@"
 sysconfdir="@sysconfdir@"
 sharedstatedir="@sharedstatedir@"
 localstatedir="@localstatedir@"
-libdir="@libdir@"
+if [ "`ldd /bin/sh | grep lib64`" = "" ]; then
+  libdir=${exec_prefix}/lib
+else
+  libdir=${exec_prefix}/lib64
+fi
 infodir="@infodir@"
 mandir="@mandir@"
 includedir="@includedir@"


Index: tn5250.spec
===================================================================
RCS file: /cvs/extras/devel/tn5250/tn5250.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- tn5250.spec	5 Dec 2007 10:45:01 -0000	1.32
+++ tn5250.spec	15 Jan 2008 14:34:01 -0000	1.33
@@ -1,13 +1,14 @@
 Summary:   5250 Telnet protocol and Terminal
 Name:      tn5250
 Version:   0.17.3
-Release:   17%{?dist}
+Release:   18%{?dist}
 License:   LGPLv2+
 Group:     Applications/Internet
 Source:    http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:   xt5250.desktop
 Patch0:    tn5250-0.16.5-bhc.patch
 Patch1:    tn5250-0.17.3-multilib.patch
+Patch2:    tn5250-0.17.3-multilibconfig.patch
 Url:       http://tn5250.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  dialog, xterm, hicolor-icon-theme
@@ -33,6 +34,7 @@
 %setup -q 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 #aclocal
@@ -104,6 +106,9 @@
 %{_bindir}/tn5250-config
 
 %changelog
+* Tue Jan 15 2008 Karsten Hopp <karsten at redhat.com> 0.17.3-18
+- fix multilib problem in /usr/bin/tn5250-config (#343301)
+
 * Wed Dec 05 2007 Karsten Hopp <karsten at redhat.com> 0.17.3-17
 - rebuild with new openssl lib