rpms/python/F-8 python-2.5.1-binutils-no-dep.patch,1.1,1.2

[James Antill (james)]

Author: james

Update of /cvs/pkgs/rpms/python/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3947

Modified Files:
	python-2.5.1-binutils-no-dep.patch 
Log Message:
* Wed Oct 24 2007 James Antill <jantill at redhat.com> - 2.5.1-14
- Remove bintuils dep. for live CD ... add work around for ctypes


python-2.5.1-binutils-no-dep.patch:

Index: python-2.5.1-binutils-no-dep.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python/F-8/python-2.5.1-binutils-no-dep.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-2.5.1-binutils-no-dep.patch	24 Oct 2007 14:57:45 -0000	1.1
+++ python-2.5.1-binutils-no-dep.patch	24 Oct 2007 15:06:48 -0000	1.2
@@ -1,15 +1,15 @@
 diff -rup Python-2.5.1-orig/Lib/ctypes/util.py Python-2.5.1/Lib/ctypes/util.py
 --- Python-2.5.1-orig/Lib/ctypes/util.py	2007-01-17 14:53:24.000000000 -0500
-+++ Python-2.5.1/Lib/ctypes/util.py	2007-10-24 10:55:19.000000000 -0400
++++ Python-2.5.1/Lib/ctypes/util.py	2007-10-24 11:06:12.000000000 -0400
 @@ -71,9 +71,13 @@ elif os.name == "posix":
          if not f:
              return None
          cmd = "objdump -p -j .dynamic 2>/dev/null " + f
 -        res = re.search(r'\sSONAME\s+([^\s]+)', os.popen(cmd).read())
-+	try:
-+        	res = re.search(r'\sSONAME\s+([^\s]+)', os.popen(cmd).read())
-+	except:
-+		res = None
++        try:
++            res = re.search(r'\sSONAME\s+([^\s]+)', os.popen(cmd).read())
++        except:
++            res = None
          if not res:
 -            return None
 +            return os.path.basename(f) # This is good for GLibc, I think, and a
@@ -18,3 +18,4 @@
  
      if (sys.platform.startswith("freebsd")
 Only in Python-2.5.1/Lib/ctypes: util.py~
+Only in Python-2.5.1/Lib/ctypes: util.py.binutils-no-dep