- up to 3.3.2

[packages/samba.git] / samba.spec

diff --git a/samba.spec b/samba.spec
index 5d8e946dea14d33d7c762d782985231972fd9e3c..41cc5e58deb6bd1c9dea54c56e691980c8290e57 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -1,4 +1,5 @@
 # TODO:
+# - drop tdb.spec and build tdb,tdb-devel,tdb-static package from samba
 # - look into other distro specs for valid %descriptions for samba 3
 # - unpackaged man pages for modules that are not built by default,
 #   maybe we should build them?
@@ -44,13 +45,13 @@ Summary(tr.UTF-8):  SMB sunucusu
 Summary(uk.UTF-8):     SMB клієнт та сервер
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:          samba
-Version:       3.2.7
-Release:       2
+Version:       3.3.2
+Release:       1
 Epoch:         1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://www.samba.org/samba/ftp/%{name}-%{version}.tar.gz
-# Source0-md5: 528677f261f3ed4a58f9483ca25ba6b2
+# Source0-md5: 5c5178ea2c5d9bd5f6569285f2e0e6d7
 Source1:       smb.init
 Source2:       %{name}.pamd
 Source3:       swat.inetd
@@ -66,8 +67,7 @@ Patch1:               %{name}-c++-nofail.patch
 Patch2:                %{name}-pthread.patch
 Patch3:                %{name}-nscd.patch
 Patch4:                %{name}-lprng-no-dot-printers.patch
-Patch5:                %{name}-printerlocation.patch
-Patch6:                %{name}-link.patch
+Patch5:                %{name}-link.patch
 URL:           http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -362,7 +362,7 @@ Summary(pt_BR.UTF-8):       Arquivos em comum entre samba e samba-clients
 Summary(ru.UTF-8):     Файлы, используемые как сервером, так и клиентом Samba
 Summary(uk.UTF-8):     Файли, що використовуються як сервером, так і клієнтом Samba
 Group:         Networking/Daemons
-Requires:      tdb >= 1.1.0
+Requires:      tdb >= 1.1.3
 
 %description common
 Samba-common provides files necessary for both the server and client
@@ -953,9 +953,8 @@ Documentacja samby w formacie PDF.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-# why this isn't upstream?
 %patch5 -p1
-%patch6 -p1
+
 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html
 
 cd examples/VFS
@@ -968,7 +967,7 @@ cd source
 %{__libtoolize}
 %{__autoconf} -Im4 -Ilib/replace
 %configure \
-       --libdir=%{_sambalibdir} \
+       --with-modulesdir=%{_sambalibdir} \
        --with-rootsbindir=/sbin \
        --with-pammodulesdir=/%{_lib}/security \
        --with-acl-support \
@@ -1041,7 +1040,6 @@ install source/bin/wbinfo         $RPM_BUILD_ROOT%{_bindir}
 install source/bin/smbget              $RPM_BUILD_ROOT%{_bindir}
 install source/bin/vfstest             $RPM_BUILD_ROOT%{_bindir}
 
-mv $RPM_BUILD_ROOT%{_libdir}/samba/lib*.so* $RPM_BUILD_ROOT%{_libdir}
 install source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
 
 # smbwrapper
@@ -1076,12 +1074,17 @@ ln -s %{_bindir}/smbspool $RPM_BUILD_ROOT%{cups_serverbin}/backend/smb
 # we have this utility in tdb package
 rm -f $RPM_BUILD_ROOT{%{_bindir}/tdb{backup,dump},%{_mandir}/man8/tdb{backup,dump}.8*}
 
+# unneeded
+rm -r $RPM_BUILD_ROOT%{_datadir}/swat/using_samba
+
 mv $RPM_BUILD_ROOT%{_bindir}/tdbtool $RPM_BUILD_ROOT%{_bindir}/tdbtool_samba
 
 %if %{with ldap}
 install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
 %endif
 
+%find_lang pam_winbind
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1153,13 +1156,26 @@ fi
 
 %dir %{_libdir}/%{name}/pdb
 %dir %{_vfsdir}
+%attr(755,root,root) %{_vfsdir}/acl_tdb.so
+%attr(755,root,root) %{_vfsdir}/acl_xattr.so
 %attr(755,root,root) %{_vfsdir}/fileid.so
+%attr(755,root,root) %{_vfsdir}/preopen.so
 %attr(755,root,root) %{_vfsdir}/shadow_copy2.so
 %attr(755,root,root) %{_vfsdir}/smb_traffic_analyzer.so
 %attr(755,root,root) %{_vfsdir}/streams_depot.so
 %attr(755,root,root) %{_vfsdir}/streams_xattr.so
 %attr(755,root,root) %{_vfsdir}/syncops.so
 %attr(755,root,root) %{_vfsdir}/xattr_tdb.so
+%{_mandir}/man8/vfs_acl_tdb.8*
+%{_mandir}/man8/vfs_acl_xattr.8*
+%{_mandir}/man8/vfs_fileid.8*
+%{_mandir}/man8/vfs_preopen.8*
+%{_mandir}/man8/vfs_shadow_copy2.8*
+%{_mandir}/man8/vfs_smb_traffic_analyzer.8*
+%{_mandir}/man8/vfs_streams_xattr.8*
+%{_mandir}/man8/vfs_streams_depot.8*
+%{_mandir}/man8/vfs_xattr_tdb.8*
+
 
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smbusers
 %attr(754,root,root) /etc/rc.d/init.d/smb
@@ -1176,10 +1192,6 @@ fi
 %{_mandir}/man8/nmbd.8*
 %{_mandir}/man8/smbd.8*
 %{_mandir}/man8/smbpasswd.8*
-%{_mandir}/man8/vfs_smb_traffic_analyzer.8*
-%{_mandir}/man8/vfs_streams_xattr.8*
-%{_mandir}/man8/vfs_streams_depot.8*
-%{_mandir}/man8/vfs_xattr_tdb.8*
 
 %dir %{_sambahome}
 %dir /var/lib/samba
@@ -1196,7 +1208,7 @@ fi
 %doc examples/LDAP
 %endif
 
-%files winbind
+%files winbind -f pam_winbind.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/winbindd
 %attr(755,root,root) %{_bindir}/wbinfo
@@ -1220,6 +1232,7 @@ fi
 %attr(755,root,root) %{_bindir}/net
 %attr(755,root,root) %{_bindir}/nmblookup
 %attr(755,root,root) %{_bindir}/rpcclient
+%attr(755,root,root) %{_bindir}/sharesec
 %attr(755,root,root) %{_bindir}/smbcacls
 %attr(755,root,root) %{_bindir}/smbclient
 %attr(755,root,root) %{_bindir}/smbsh
@@ -1230,6 +1243,7 @@ fi
 %{_mandir}/man1/findsmb.1*
 %{_mandir}/man1/nmblookup.1*
 %{_mandir}/man1/rpcclient.1*
+%{_mandir}/man1/sharesec.1*
 %{_mandir}/man1/smbcacls.1*
 %{_mandir}/man1/smbclient.1*
 %{_mandir}/man1/smbsh.1*
@@ -1271,10 +1285,13 @@ fi
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/eventlogadm.8*
 %{_mandir}/man8/idmap_ad.8*
+%{_mandir}/man8/idmap_adex.8*
+%{_mandir}/man8/idmap_hash.8*
 %{_mandir}/man8/idmap_ldap.8*
 %{_mandir}/man8/idmap_nss.8*
 %{_mandir}/man8/idmap_rid.8*
 %{_mandir}/man8/idmap_tdb.8*
+%{_mandir}/man8/idmap_tdb2.8*
 %{_mandir}/man8/tdbtool.8*
 
 %files swat