samba-4.0.4-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7596 ec354946-7b23-47d6-9f5a-488ba84defc7

s/samba/samba-vl.spec

@@ -1,4 +1,5 @@
-%define samba_version 4.0.3
+%define samba_version 4.0.4
+%define doc_version 4.0.0-1
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %global with_libsmbclient 1
@@ -36,14 +37,8 @@ Source: http://www.samba.org/samba/ftp/samba-%{version}.tar.gz
 
 # Vine specific replacement-files
 Source1: samba.log
-#Source2: samba.xinetd
+Source2: samba-ja-docs-%{doc_version}.tar.gz
-#Source3: swat.desktop
-#Source4: samba.sysconfig
 Source5: pam_winbind.conf
-#Source6: samba.pamd
-#Source7: smbprint
-#Source8: winbind.init
-#Source9: smb.conf.default
 
 Source100:     nmb.init
 Source101:     smb.init
@@ -205,7 +200,7 @@ Provides: samba-common = %{samba_version}-%{release}
 Requires: %{name}-libs = %{samba_version}-%{release}
 Requires: pam
 Requires(pre): /usr/sbin/groupadd
-Requires(post): /sbin/chkconfig, /sbin/service, coreutils
+Requires(post): /sbin/chkconfig, /sbin/service, coreutils, acl
 Requires(preun): /sbin/chkconfig, /sbin/service
 
 %description common
@@ -345,9 +340,11 @@ library.
 %package dc
 Summary: Samba AD Domain Controller
 Group: Applications/System
-Requires: bind-current >= 1:9.8.4
+Requires: %{name} = %{samba_version}-%{release}
-Requires: %{name}-libs = %{samba_version}-%{release}
+Requires: %{name}-winbind = %{samba_version}-%{release}
+Requires: %{name}-client = %{samba_version}-%{release}
 Requires: %{name}-python = %{samba_version}-%{release}
+Requires(post): /sbin/chkconfig, /sbin/service, acl
 
 %description dc
 The %{name}-dc package provides AD Domain Controller functionality
@@ -387,6 +384,11 @@ the Samba suite.
 %prep
 %setup -q -n samba-%{samba_version}
 
+mkdir -p docs-ja
+pushd docs-ja
+tar zxf %{SOURCE2}
+popd
+
 ## ====================================================================
 %build
 sed \
@@ -432,7 +434,7 @@ make distclean
   --with-lockdir=/var/lib/samba \
   --with-logfilebase=/var/log/samba \
   --with-piddir=/var/run/samba \
-  --with-privatedir=%{_sysconfdir}/samba
+  --with-privatedir=/var/lib/samba/private
 
 #  --bundled-libraries=NONE \
 #  --with-system-mitkrb5 \
@@ -548,6 +550,12 @@ rm -f %{buildroot}%{_libdir}/pkgconfig/tevent.pc
 rm -f %{buildroot}%{_libdir}/pkgconfig/torture.pc
 rm -f %{buildroot}%{_libdir}/pkgconfig/dcerpc_server.pc
 
+find docs-ja/docs-xml/output/manpages/ -type f| while read f; do
+  c=`echo -n $f | sed -e 's,^.*\.,,'`
+  mkdir -p %{buildroot}%{_mandir}/ja/man$c
+  cp -f $f %{buildroot}%{_mandir}/ja/man$c/
+done
+
 
 ## ====================================================================
 %clean
@@ -555,8 +563,8 @@ rm -rf %{buildroot}
 
 %pre
 if [ "$1" -eq "2" ]; then
-  PREV=`/usr/sbin/smbd -V | sed -e 's/^Version \([0-9]*\)\..*$/\1/'`
+  PREV=`/usr/sbin/smbd -V 2>/dev/null | sed -e 's/^Version \([0-9]*\)\..*$/\1/'`
-  if [ "$PREV" -lt "4" ]; then
+  if [ "x$PREV" == "x3" ]; then
     /sbin/service smb stop >/dev/null 2>&1 || :
     /sbin/service nmb stop >/dev/null 2>&1 || :
 
@@ -637,10 +645,17 @@ if [ "$1" -ge "1" ]; then
 	/sbin/service winbind condrestart >/dev/null 2>&1 || :
 fi
 
+## --------------------------------------------------------------------
+%post dc
+
+setfacl -m u:named:rwx /var/lib/samba/private >/dev/null 2>/dev/null || :
+
 ## --------------------------------------------------------------------
 %post common
 /sbin/ldconfig
 
+setfacl -m u:named:rwx /var/lib/samba/private >/dev/null 2>/dev/null || :
+
 ## --------------------------------------------------------------------
 %preun winbind
 if [ $1 = 0 ] ; then
@@ -682,7 +697,7 @@ exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING MAINTAINERS.txt PFIF.txt README README.Coding README.contributing README.packaging4 Roadmap VERSION WHATSNEW.txt
+%doc COPYING MAINTAINERS.txt PFIF.txt README README.Coding README.contributing README.packaging4 Roadmap VERSION WHATSNEW.txt docs-ja/docs-xml/output/htmldocs
 %{_bindir}/smbstatus
 %{_bindir}/eventlogadm
 %{_sbindir}/nmbd
@@ -736,6 +751,47 @@ exit 0
 %{_mandir}/man8/vfs_time_audit.8.gz
 %{_mandir}/man8/vfs_tsmsm.8.gz
 %{_mandir}/man8/vfs_xattr_tdb.8.gz
+# ja manuals
+%{_mandir}/ja/man1/smbstatus.1.gz
+%{_mandir}/ja/man7/samba.7.gz
+%{_mandir}/ja/man8/eventlogadm.8.gz
+%{_mandir}/ja/man8/nmbd.8.gz
+%{_mandir}/ja/man8/smbd.8.gz
+%{_mandir}/ja/man8/vfs_acl_tdb.8.gz
+%{_mandir}/ja/man8/vfs_acl_xattr.8.gz
+%{_mandir}/ja/man8/vfs_aio_fork.8.gz
+%{_mandir}/ja/man8/vfs_aio_linux.8.gz
+%{_mandir}/ja/man8/vfs_aio_pthread.8.gz
+%{_mandir}/ja/man8/vfs_audit.8.gz
+%{_mandir}/ja/man8/vfs_cacheprime.8.gz
+%{_mandir}/ja/man8/vfs_cap.8.gz
+%{_mandir}/ja/man8/vfs_catia.8.gz
+%{_mandir}/ja/man8/vfs_commit.8.gz
+%{_mandir}/ja/man8/vfs_crossrename.8.gz
+%{_mandir}/ja/man8/vfs_default_quota.8.gz
+%{_mandir}/ja/man8/vfs_dirsort.8.gz
+%{_mandir}/ja/man8/vfs_extd_audit.8.gz
+%{_mandir}/ja/man8/vfs_fake_perms.8.gz
+%{_mandir}/ja/man8/vfs_fileid.8.gz
+%{_mandir}/ja/man8/vfs_full_audit.8.gz
+%{_mandir}/ja/man8/vfs_gpfs.8.gz
+%{_mandir}/ja/man8/vfs_media_harmony.8.gz
+%{_mandir}/ja/man8/vfs_netatalk.8.gz
+%{_mandir}/ja/man8/vfs_notify_fam.8.gz
+%{_mandir}/ja/man8/vfs_prealloc.8.gz
+%{_mandir}/ja/man8/vfs_preopen.8.gz
+%{_mandir}/ja/man8/vfs_readahead.8.gz
+%{_mandir}/ja/man8/vfs_readonly.8.gz
+%{_mandir}/ja/man8/vfs_recycle.8.gz
+%{_mandir}/ja/man8/vfs_scannedonly.8.gz
+%{_mandir}/ja/man8/vfs_shadow_copy.8.gz
+%{_mandir}/ja/man8/vfs_shadow_copy2.8.gz
+%{_mandir}/ja/man8/vfs_smb_traffic_analyzer.8.gz
+%{_mandir}/ja/man8/vfs_streams_depot.8.gz
+%{_mandir}/ja/man8/vfs_streams_xattr.8.gz
+%{_mandir}/ja/man8/vfs_time_audit.8.gz
+%{_mandir}/ja/man8/vfs_tsmsm.8.gz
+%{_mandir}/ja/man8/vfs_xattr_tdb.8.gz
 
 ## --------------------------------------------------------------------
 %files libs
@@ -873,6 +929,8 @@ exit 0
 %{_libdir}/libsmbclient.so.*
 %{_libdir}/libsmbsharemodes.so.*
 %{_mandir}/man7/libsmbclient.7.gz
+# ja manual
+%{_mandir}/ja/man7/libsmbclient.7.gz
 %endif # ! with_libsmbclient
 
 %if ! %with_libwbclient
@@ -897,7 +955,7 @@ exit 0
 %dir /var/run/winbindd
 %dir /var/lib/samba
 %dir /var/cache/samba
-#%attr(700,root,root) %dir /var/lib/samba/private
+%attr(700,root,root) %dir /var/lib/samba/private
 %attr(755,root,root) %dir %{_sysconfdir}/samba
 %config(noreplace) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %{_sysconfdir}/samba/lmhosts
@@ -910,6 +968,14 @@ exit 0
 %{_mandir}/man5/smb.conf.5.gz
 %{_mandir}/man8/net.8.gz
 %{_mandir}/man8/pdbedit.8.gz
+# ja manuals
+%{_mandir}/ja/man1/profiles.1.gz
+%{_mandir}/ja/man1/smbcontrol.1.gz
+%{_mandir}/ja/man1/testparm.1.gz
+%{_mandir}/ja/man5/lmhosts.5.gz
+%{_mandir}/ja/man5/smb.conf.5.gz
+%{_mandir}/ja/man8/net.8.gz
+%{_mandir}/ja/man8/pdbedit.8.gz
 
 # common libraries
 %{_libdir}/samba/libauth.so
@@ -953,6 +1019,9 @@ exit 0
 %{_mandir}/man8/samba.8.gz
 %{_mandir}/man8/samba-tool.8.gz
 #%{_mandir}/man3/ldb.3.gz
+# ja manuals
+%{_mandir}/ja/man8/samba.8.gz
+%{_mandir}/ja/man8/samba-tool.8.gz
 
 ## --------------------------------------------------------------------
 %files winbind
@@ -971,12 +1040,18 @@ exit 0
 %{_mandir}/man8/idmap_*.8*
 #%{_datadir}/locale/*/LC_MESSAGES/pam_winbind.mo
 %{_initrddir}/winbind
+# ja manuals
+%{_mandir}/ja/man5/pam_winbind.conf.5.gz
+%{_mandir}/ja/man8/winbindd.8.gz
+%{_mandir}/ja/man8/idmap_*.8*
 
 ## --------------------------------------------------------------------
 %files winbind-krb5-locator
 %defattr(-,root,root)
 %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 %{_mandir}/man7/winbind_krb5_locator.7.gz
+# ja manual
+%{_mandir}/ja/man7/winbind_krb5_locator.7.gz
 
 ## --------------------------------------------------------------------
 %files winbind-clients
@@ -992,6 +1067,10 @@ exit 0
 %{_mandir}/man1/ntlm_auth.1.gz
 %{_mandir}/man1/wbinfo.1.gz
 %{_mandir}/man8/pam_winbind.8.gz
+# ja manuals
+%{_mandir}/ja/man1/ntlm_auth.1.gz
+%{_mandir}/ja/man1/wbinfo.1.gz
+%{_mandir}/ja/man8/pam_winbind.8.gz
 
 ## --------------------------------------------------------------------
 %files client
@@ -1024,6 +1103,7 @@ exit 0
 %{_bindir}/smbtree
 #%{_bindir}/split_tokens
 %exclude %{_libdir}/samba/libldb-cmdline.so
+%{_mandir}/man1/dbwrap_tool.1.gz
 %{_mandir}/man1/findsmb.1.gz
 %{_mandir}/man1/log2pcap.1.gz
 %{_mandir}/man1/nmblookup.1.gz
@@ -1046,6 +1126,23 @@ exit 0
 %{_mandir}/man8/smbpasswd.8.gz
 %{_mandir}/man8/smbspool.8.gz
 %{_mandir}/man8/smbta-util.8.gz
+#ja manuals
+%{_mandir}/ja/man1/findsmb.1.gz
+%{_mandir}/ja/man1/log2pcap.1.gz
+%{_mandir}/ja/man1/nmblookup.1.gz
+%{_mandir}/ja/man1/rpcclient.1.gz
+%{_mandir}/ja/man1/sharesec.1.gz
+%{_mandir}/ja/man1/smbcacls.1.gz
+%{_mandir}/ja/man1/smbclient.1.gz
+%{_mandir}/ja/man1/smbcquotas.1.gz
+%{_mandir}/ja/man1/smbget.1.gz
+%{_mandir}/ja/man1/smbtar.1.gz
+%{_mandir}/ja/man1/smbtree.1.gz
+%{_mandir}/ja/man5/smbgetrc.5.gz
+%{_mandir}/ja/man5/smbpasswd.5.gz
+%{_mandir}/ja/man8/smbpasswd.8.gz
+%{_mandir}/ja/man8/smbspool.8.gz
+%{_mandir}/ja/man8/smbta-util.8.gz
 
 %if %{with_ntdb}
 %{_bindir}/ntdbbackup
@@ -1088,6 +1185,8 @@ exit 0
 %{_mandir}/man1/ndrdump.1.gz
 %{_mandir}/man1/smbtorture.1.gz
 %{_mandir}/man1/vfstest.1.gz
+# ja manual
+%{_mandir}/ja/man1/vfstest.1.gz
 
 ## --------------------------------------------------------------------
 %files devel
@@ -1283,6 +1382,8 @@ exit 0
 %{_sbindir}/swat
 %{_mandir}/man8/swat.8.gz
 #%attr(755,root,root) %{_libdir}/samba/*.msg
+# ja manual
+%{_mandir}/ja/man8/swat.8.gz
 
 ## --------------------------------------------------------------------
 %if %with_libsmbclient
@@ -1291,6 +1392,8 @@ exit 0
 %{_libdir}/libsmbclient.so.*
 %{_libdir}/libsmbsharemodes.so.*
 %{_mandir}/man7/libsmbclient.7.gz
+# ja manual
+%{_mandir}/ja/man7/libsmbclient.7.gz
 
 ## --------------------------------------------------------------------
 %files -n libsmbclient-devel
@@ -1335,9 +1438,17 @@ exit 0
 %endif
 
 %changelog
+* Tue Mar 26 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.4-1
+- new upstream release.
+- fixed dependency.
+- added documents from samba-docs-ja-4.0.0-1.
+
+* Mon Mar 04 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.3-2
+- fixed directory to place private data.
+
 * Sun Mar 03 2013 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.3-1
 - new upstream release.
-- fixes dates of %%changelog.
+- fixed dates of %%changelog.
 
 * Mon Dec 17 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.0-1
 - new upstream release.