SOURCES: samba-setup-python.patch - updated for 3.0.21

[tommat]

Author: tommat                       Date: Sun Dec 25 18:44:58 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 3.0.21

---- Files affected:
SOURCES:
   samba-setup-python.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/samba-setup-python.patch
diff -u SOURCES/samba-setup-python.patch:1.3 SOURCES/samba-setup-python.patch:1.4
--- SOURCES/samba-setup-python.patch:1.3	Tue Oct  4 16:47:07 2005
+++ SOURCES/samba-setup-python.patch	Sun Dec 25 19:44:52 2005
@@ -1,32 +1,14 @@
-diff -Nur samba-3.0.20a-orig/source/python/setup.py samba-3.0.20a/source/python/setup.py
---- samba-3.0.20a-orig/source/python/setup.py	2005-09-29 23:52:39.000000000 +0200
-+++ samba-3.0.20a/source/python/setup.py	2005-10-04 14:53:04.555788552 +0200
-@@ -51,13 +51,17 @@
- 
- libraries = []
- library_dirs = []
-+skip_next_keyword = 0
- 
- for lib in string.split(samba_libs):
-+    if (skip_next_keyword):
-+	skip_next_keyword = 0
-+	continue
-     if lib[0:2] == "-l":
+--- samba-3.0.21/source/python/setup.py.orig	2005-12-25 20:27:49.884427000 +0100
++++ samba-3.0.21/source/python/setup.py	2005-12-25 20:32:21.984427000 +0100
+@@ -63,8 +63,10 @@
+         next_is_flag = 0;
+     elif lib == "-Wl,-rpath":
+         next_is_path = 1;
+-    elif lib[0:2] in ("-l","-pthread"):
++    elif lib[0:2] == "-l":
          libraries.append(lib[2:])
-         continue
-     if lib[0:8] == "-pthread":
--        libraries.append(lib[2:])
-+	library_dirs.append("-lpthread")
-         continue
-     if lib[0:2] == "-L":
++    elif lib[0:8] == "-pthread":
++	libraries.append(lib[1:])
+     elif lib[0:2] == "-L":
          library_dirs.append(lib[2:])
-@@ -65,6 +69,9 @@
-     if lib[0:2] == "-W":
-         # Skip linker flags
-         continue
-+    if lib[0:2] == "-z":
-+	skip_next_keyword = 1
-+	continue
-     print "Unknown entry '%s' in $LIBS variable passed to setup.py" % lib
-     sys.exit(1)
- 
+     elif lib[0:2] in ("-W","-s"):
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/samba-setup-python.patch?r1=1.3&r2=1.4&f=u