rpms/python/FC-4 python-2.4.3-config.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: misa

Update of /cvs/dist/rpms/python/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv20783

Modified Files:
	python-2.4.3-config.patch 
Log Message:
Reworked config patch, making it FC4 friendly

python-2.4.3-config.patch:
 Setup.dist |  127 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 63 insertions(+), 64 deletions(-)

Index: python-2.4.3-config.patch
===================================================================
RCS file: /cvs/dist/rpms/python/FC-4/python-2.4.3-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-2.4.3-config.patch	13 Jun 2006 15:38:25 -0000	1.1
+++ python-2.4.3-config.patch	13 Jun 2006 16:47:58 -0000	1.2
@@ -149,7 +149,7 @@
  
  
  # The _tkinter module.
-@@ -309,7 +309,7 @@
+@@ -309,17 +309,17 @@
  # every system.
  
  # *** Always uncomment this (leave the leading underscore in!):
@@ -158,7 +158,10 @@
  # *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
  #	-L/usr/local/lib \
  # *** Uncomment and edit to reflect where your Tcl/Tk headers are:
-@@ -319,7 +319,7 @@
+ #	-I/usr/local/include \
+ # *** Uncomment and edit to reflect where your X11 header files are:
+-#	-I/usr/X11R6/include \
++	-I/usr/X11R6/include \
  # *** Or uncomment this for Solaris:
  #	-I/usr/openwin/include \
  # *** Uncomment and edit for Tix extension only:
@@ -167,15 +170,18 @@
  # *** Uncomment and edit for BLT extension only:
  #	-DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
  # *** Uncomment and edit for PIL (TkImaging) extension only:
-@@ -328,7 +328,7 @@
+@@ -328,9 +328,9 @@
  # *** Uncomment and edit for TOGL extension only:
  #	-DWITH_TOGL togl.c \
  # *** Uncomment and edit to reflect your Tcl/Tk versions:
 -#	-ltk8.2 -ltcl8.2 \
 +	-ltk -ltcl \
  # *** Uncomment and edit to reflect where your X11 libraries are:
- #	-L/usr/X11R6/lib \
+-#	-L/usr/X11R6/lib \
++	-L/usr/X11R6/lib \
  # *** Or uncomment this for Solaris:
+ #	-L/usr/openwin/lib \
+ # *** Uncomment these for TOGL extension only:
 @@ -338,7 +338,7 @@
  # *** Uncomment for AIX:
  #	-lld \