- reverted

Changed files:
    samba-link.patch -> 1.5
    samba-nscd.patch -> 1.4
    samba.spec -> 1.462

diff --git a/samba-link.patch b/samba-link.patch
index 3a9fed604c368b63f8d187590593784d5eb2714d..4d0ebbec7b291808020ad2b08806bc2d2877caeb 100644 (file)
--- a/samba-link.patch
+++ b/samba-link.patch
@@ -1,11 +1,11 @@
---- samba-3.4.1/source3/Makefile.in.orig       2009-09-10 08:02:36.000000000 +0200
-+++ samba-3.4.1/source3/Makefile.in    2009-09-10 08:05:13.000000000 +0200
+--- samba-3.2.4/source3/Makefile.in.orig       2008-10-09 23:09:56.133256245 +0200
++++ samba-3.2.4/source3/Makefile.in    2008-10-09 23:10:15.631916148 +0200
 @@ -1468,7 +1468,7 @@
  bin/cifs.upcall@EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
        @$(CC) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
--              $(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) \
-+              $(LIBSMBCLIENT_OBJ1) $(LIBS) -lkeyutils $(KRB5LIBS) $(ZLIB_LIBS) \
+-              -lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
++              -lkeyutils $(LIBSMBCLIENT_OBJ1) $(LIBS) $(KRB5LIBS) $(ZLIB_LIBS) \
                $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_LIBS) \
                $(LIBTDB_LIBS) $(NSCD_LIBS)
  

diff --git a/samba-nscd.patch b/samba-nscd.patch
index 8330671a771797bb3bade1ed82e88a8b68df2699..d71224a597e01ec40e9332ba8acd0b67bad444e0 100644 (file)
--- a/samba-nscd.patch
+++ b/samba-nscd.patch
@@ -1,11 +1,12 @@
---- samba-3.4.1/source3/Makefile.in.orig       2009-09-09 20:51:56.000000000 +0200
-+++ samba-3.4.1/source3/Makefile.in    2009-09-10 07:57:29.000000000 +0200
+diff -urN samba-3.2.1.org/source3/Makefile.in samba-3.2.1/source3/Makefile.in
+--- samba-3.2.1.org/source3/Makefile.in        2008-08-05 08:22:33.000000000 +0200
++++ samba-3.2.1/source3/Makefile.in    2008-08-17 23:24:32.085914644 +0200
 @@ -1430,7 +1430,7 @@
-       @$(CC) -o $@ $(LDFLAGS) $(RPCCLIENT_OBJ) \
+       @$(CC) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
                $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
                $(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
--              $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS)
-+              $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(PASSDB_LIBS) $(NSCD_LIBS)
+-              $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS)
++              $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) $(NSCD_LIBS)
  
  bin/smbclient@EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
@@ -18,3 +19,4 @@
  
  bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
        @echo Linking $@
+

diff --git a/samba.spec b/samba.spec
index 7e20bdc43d00653efee2b45a661997461f4e5f21..4695f3ed9285c022da32b1724e46b64351c70a4b 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -30,13 +30,13 @@ Summary(tr.UTF-8):  SMB sunucusu
 Summary(uk.UTF-8):     SMB клієнт та сервер
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:          samba
-Version:       3.4.1
-Release:       1
+Version:       3.4.0
+Release:       2
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
 Source0:       http://www.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz
-# Source0-md5: f857c534148e28b686996d232da76cec
+# Source0-md5: a7137736379daf9855814ae14c2c5e22
 Source1:       smb.init
 Source2:       %{name}.pamd
 Source3:       swat.inetd
@@ -53,7 +53,7 @@ Patch2:               %{name}-pthread.patch
 Patch3:                %{name}-nscd.patch
 Patch4:                %{name}-lprng-no-dot-printers.patch
 Patch5:                %{name}-link.patch
-#Patch6:               %{name}-pr6551.patch
+Patch6:                %{name}-pr6551.patch
 URL:           http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -952,7 +952,7 @@ Samba Module for Python.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
+%patch6 -p1
 
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html