rpms/ppracer/devel ppracer-0.3.1-lib64.patch, NONE, 1.1 ppracer.spec, 1.11, 1.12 ppracer-0.3.1-optflags.patch, 1.1, NONE

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25283

Modified Files:
	ppracer.spec 
Added Files:
	ppracer-0.3.1-lib64.patch 
Removed Files:
	ppracer-0.3.1-optflags.patch 
Log Message:
look in .../lib64 as well for tclConfig.sh
remove obsolete optflags patch


ppracer-0.3.1-lib64.patch:

--- NEW FILE ppracer-0.3.1-lib64.patch ---
--- ppracer-0.3.1/configure.in.lib64	2005-02-27 19:43:18.000000000 +0100
+++ ppracer-0.3.1/configure.in	2005-03-16 13:23:36.600097963 +0100
@@ -127,29 +127,31 @@
     found=0
     if test "$tcl" != "no"; then
     	tcl=no
-    	for try in $dirs; do
-    		if test -f $try/tclConfig.sh; then		
-    			found=1
-    			. $try/tclConfig.sh
-    			tcl=yes
-                customtcl="no"
-                if test "x$with_tcl_lib_name" != "x"; then
-                    TCL_LIBS="-l$with_tcl_lib_name"
-                    AC_MSG_NOTICE(["Using custom TCL Library: $with_tcl_lib_name"])
-                else
-                    TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
-                fi
-
-                if test "x$with_tcl_inc" != "x"; then
-                    TCL_CFLAGS="-I$with_tcl_inc"
-                    AC_MSG_NOTICE(["Using custom TCL headers directory: $with_tcl_inc"])
-                else
-                    TCL_CFLAGS="-I$TCL_INC_DIR $TCL_INCLUDE_SPEC"
-                fi
-
-    			AC_MSG_RESULT($try/tclConfig.sh)
-    			break
-    		fi
+    	for trydir in $dirs; do
+            for try in ${trydir}64 ${trydir}; do
+    		    if test -f $try/tclConfig.sh; then		
+    			    found=1
+    			    . $try/tclConfig.sh
+    			    tcl=yes
+                    customtcl="no"
+                    if test "x$with_tcl_lib_name" != "x"; then
+                        TCL_LIBS="-l$with_tcl_lib_name"
+                        AC_MSG_NOTICE(["Using custom TCL Library: $with_tcl_lib_name"])
+                    else
+                        TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
+                    fi
+
+                    if test "x$with_tcl_inc" != "x"; then
+                        TCL_CFLAGS="-I$with_tcl_inc"
+                        AC_MSG_NOTICE(["Using custom TCL headers directory: $with_tcl_inc"])
+                    else
+                        TCL_CFLAGS="-I$TCL_INC_DIR $TCL_INCLUDE_SPEC"
+                    fi
+
+    			    AC_MSG_RESULT($try/tclConfig.sh)
+    			    break
+    		    fi
+            done
     	done
     	if test "$found" -eq 0 ; then
     		AC_MSG_ERROR([tclConfig.sh not found - use the --with-tcl option])


Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ppracer.spec	15 Mar 2005 17:02:15 -0000	1.11
+++ ppracer.spec	16 Mar 2005 12:27:22 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 3
+Release: 4
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -16,6 +16,7 @@
 Source2: ppracer.desktop
 
 Patch0: PPRacer-0.1.9-ia64.patch
+Patch1: ppracer-0.3.1-lib64.patch
 
 BuildRequires: xorg-x11-devel
 BuildRequires: SDL-devel >= 1.2
@@ -38,6 +39,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .ia64
+%patch1 -p1 -b .lib64
 
 %build
 autoconf
@@ -67,6 +69,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Wed Mar 16 2005 Nils Philippsen <nphilipp at redhat.com>
+- look in .../lib64 as well for tclConfig.sh
+
 * Tue Mar 15 2005 Nils Philippsen <nphilipp at redhat.com>
 - buildrequire correct tcl-devel version that includes tclConfig.sh
 


--- ppracer-0.3.1-optflags.patch DELETED ---