- minor fix for setup.py (I followed my nose in doing this fix).

  # LIBS="-z combreloc -lcrypt -lresolv -lnsl -ldl    " \
  #        python python/setup.py build
  # Unknown entry '-z' in $LIBS variable passed to setup.py

Changed files:
    samba-setup-python.patch -> 1.1
    samba.spec -> 1.220

diff --git a/samba-setup-python.patch b/samba-setup-python.patch
new file mode 100644 (file)
index 0000000..38aea85
--- /dev/null
+++ b/samba-setup-python.patch
@@ -0,0 +1,25 @@
+--- samba-3.0.6/source/python/setup.py.orig    2004-04-04 09:37:15.000000000 +0200
++++ samba-3.0.6/source/python/setup.py 2004-09-02 22:53:26.622271448 +0200
+@@ -49,8 +49,12 @@
+ 
+ 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":
+         libraries.append(lib[2:])
+         continue
+@@ -60,6 +64,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)
+ 

diff --git a/samba.spec b/samba.spec
index 132513fcd527cd41d9d5af156ebdfb9bfb818e12..b122fb9e3da55834c6e2bd22c8db307d7f3c4251 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -55,6 +55,7 @@ Source10:     http://us1.samba.org/samba/ftp/samba.schema
 Patch0:                %{name}-statfs-workaround.patch
 Patch1:                %{name}-lib64.patch
 #Patch2:       http://v6web.litech.org/samba/%{name}-2.2.4+IPv6-20020609.diff
+Patch3:                %{name}-setup-python.patch
 URL:           http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -822,6 +823,7 @@ dost
 %patch1 -p1
 %endif
 #%{?with_ipv6:%patch2 -p1}
+%patch3 -p1
 
 cp -f %{SOURCE10} examples/LDAP/
 cd examples/VFS