Author: glen Date: Sun Nov 18 14:06:41 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged 3.0.27 from HEAD
---- Files affected: SPECS: samba.spec (1.348.2.7.2.5 -> 1.348.2.7.2.6) ---- Diffs: ================================================================ Index: SPECS/samba.spec diff -u SPECS/samba.spec:1.348.2.7.2.5 SPECS/samba.spec:1.348.2.7.2.6 --- SPECS/samba.spec:1.348.2.7.2.5 Sat Nov 17 17:51:37 2007 +++ SPECS/samba.spec Sun Nov 18 15:06:36 2007 @@ -3,14 +3,12 @@ # - 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? -# /usr/share/man/man8/vfs_cacheprime.8.gz -# /usr/share/man/man8/vfs_catia.8.gz -# /usr/share/man/man8/vfs_commit.8.gz -# /usr/share/man/man8/vfs_extd_audit.8.gz -# /usr/share/man/man8/vfs_full_audit.8.gz -# /usr/share/man/man8/vfs_gpfs.8.gz -# /usr/share/man/man8/vfs_notify_fam.8.gz -# /usr/share/man/man8/vfs_prealloc.8.gz +# /usr/share/man/man8/vfs_cacheprime.8* +# /usr/share/man/man8/vfs_catia.8* +# /usr/share/man/man8/vfs_commit.8* +# /usr/share/man/man8/vfs_gpfs.8* +# /usr/share/man/man8/vfs_notify_fam.8* +# /usr/share/man/man8/vfs_prealloc.8* # - libmsrpc.so is broken (references smbc_attr_server() which is no longer exported from libsmbclient) # # Conditional build: @@ -42,13 +40,13 @@ Summary(uk.UTF-8): SMB клієнт та сервер Summary(zh_CN.UTF-8): Samba 客户端和服务器 Name: samba -Version: 3.0.26a +Version: 3.0.27 Release: 1 Epoch: 1 License: GPL v2 Group: Networking/Daemons Source0: http://us1.samba.org/samba/ftp/%{name}-%{version}.tar.gz -# Source0-md5: 16b47e6add332e5ac4523fc88c381d06 +# Source0-md5: cff7854ea5947882954f30d2657e1a9d Source1: smb.init Source2: %{name}.pamd Source3: swat.inetd @@ -66,6 +64,8 @@ Patch4: %{name}-libsmbclient-libnscd_link.patch Patch5: %{name}-doc.patch Patch6: %{name}-libs-needed.patch +Patch7: %{name}-lprng-no-dot-printers.patch +Patch8: %{name}-pam_smbpass-syslog.patch URL: http://www.samba.org/ BuildRequires: acl-devel BuildRequires: autoconf @@ -93,7 +93,7 @@ BuildRequires: xfsprogs-devel Requires(post,preun): /sbin/chkconfig Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: logrotate +Requires: logrotate >= 3.7-4 Requires: pam >= 0.66 Requires: rc-scripts Requires: setup >= 2.4.6-7 @@ -975,11 +975,14 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %{__sed} -i 's#%SAMBAVERSION%#%{version}#' docs/htmldocs/index.html cd examples/VFS tar xzf %{SOURCE7} mv README{,.vfs} +cd ../.. %build cd source @@ -1030,7 +1033,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig/rc-inetd} \ - $RPM_BUILD_ROOT{/var/{log,log/archiv,spool}/samba,/var/lib/samba/printing} \ + $RPM_BUILD_ROOT{/var/{log,log/archive,spool}/samba,/var/lib/samba/printing} \ $RPM_BUILD_ROOT/var/log/samba/cores/{smbd,nmbd} \ $RPM_BUILD_ROOT{/sbin,/%{_lib}/security,%{_libdir},%{_vfsdir},%{_includedir},%{_sambahome},%{schemadir}} @@ -1207,7 +1210,7 @@ %attr(750,root,root) %dir /var/log/samba/cores %attr(750,root,root) %dir /var/log/samba/cores/smbd %attr(750,root,root) %dir /var/log/samba/cores/nmbd -%attr(750,root,root) %dir /var/log/archiv/samba +%attr(750,root,root) %dir /var/log/archive/samba %attr(1777,root,root) %dir /var/spool/samba %if %{with ldap} %doc examples/LDAP @@ -1383,6 +1386,8 @@ %attr(755,root,root) %{_vfsdir}/extd_audit.so %attr(755,root,root) %{_vfsdir}/full_audit.so %{_mandir}/man8/vfs_audit.8* +%{_mandir}/man8/vfs_extd_audit.8* +%{_mandir}/man8/vfs_full_audit.8* %files vfs-cap %defattr(644,root,root,755) @@ -1516,6 +1521,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.348.2.7.2.6 2007-11-18 14:06:36 glen +- merged 3.0.27 from HEAD + Revision 1.348.2.7.2.5 2007-11-17 16:51:37 glen - rever bogus es description ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/samba.spec?r1=1.348.2.7.2.5&r2=1.348.2.7.2.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
