samba-4.8.0-1

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

s/samba/samba-vl.spec

@@ -1,7 +1,10 @@
-%define samba_version 4.6.6
+%define samba_version 4.8.0
+#define rc_number rc4
+%define samba_release 1
+
 %define doc_version 4.6.6
 %define api_version 4.0
-%define libwbc_sover 0.13
+%define libwbc_sover 0.14
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %global with_libsmbclient 1
@@ -23,7 +26,8 @@
 %global libwbc_alternatives_suffix -64
 %endif
 
-%define samba_release 1
+%{?rc_number:%define rc_suffix .%{rc_number}}
+
 
 %define samba_source source3
 
@@ -35,14 +39,14 @@ Summary: The Samba Suite of programs
 Summary(ja): Samba スイート
 Name: samba
 Version: %{samba_version}
-Release: %{samba_release}%{?_dist_release}
+Release: %{samba_release}%{?rc_suffix}%{?_dist_release}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
 %define samba_includedir   %{_includedir}/samba-%{api_version}
 
-Source: http://www.samba.org/samba/ftp/samba-%{version}.tar.gz
+Source: https://download.samba.org/pub/samba/stable/samba-%{version}%{?rc_number}.tar.gz
 
 # Vine specific replacement-files
 Source1: samba.log
@@ -53,6 +57,8 @@ Source6: samba.pamd
 Source100:     nmb.init
 Source101:     smb.init
 Source102:     winbind.init
+Source103:     smb.conf
+Source104:     samba.sysconfig
 Source200:     samba4.init
 Source201:     named.conf.dlz
 
@@ -412,15 +418,13 @@ the Samba suite.
 
 ## ====================================================================
 %prep
-%setup -q -n samba-%{samba_version}
+%setup -q -n samba-%{samba_version}%{?rc_number}
 
 mkdir -p docs-ja
 pushd docs-ja
 tar zxf %{SOURCE2}
 popd
 
-perl -pi -e 's|/usr/local/samba/var/|/var/log/samba/|' packaging/RHEL/setup/smb.conf
-
 ## ====================================================================
 %build
 
@@ -537,7 +541,7 @@ mv %{buildroot}/%{_libdir}/libwbclient.so* %{buildroot}/%{_libdir}/samba/wbclien
 # Install other stuff
 install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/samba
 
-install -m644 packaging/RHEL/setup/smb.conf %{buildroot}%{_sysconfdir}/samba/smb.conf
+install -m644 %{SOURCE103} ./smb.conf.example
 
 install -d -m 0755 %{buildroot}%{_sysconfdir}/security
 install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/pam_winbind.conf
@@ -559,13 +563,11 @@ install -m 0744 packaging/printing/smbprint %{buildroot}%{_bindir}/smbprint
 
 
 install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
-install -m 0644 packaging/RHEL/setup/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
+install -m 0644 %{SOURCE104} %{buildroot}%{_sysconfdir}/sysconfig/samba
 
 #install -m 0644 ctdb/config/ctdb.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/ctdb
 
 
-#install -m 0644 %{SOURCE201} packaging/README.downgrade
-
 # winbind krb5 locator
 install -d -m 0755 %{buildroot}%{_libdir}/krb5/plugins/libkrb5
 touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
@@ -587,7 +589,6 @@ find docs-ja/docs-xml/output/manpages/ -type f| while read f; do
   cp -f $f.gz %{buildroot}%{_mandir}/ja/man$c/
 done
 
-
 ## ====================================================================
 %clean
 rm -rf %{buildroot}
@@ -787,7 +788,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %license COPYING
-%doc PFIF.txt README README.Coding README.contributing Roadmap VERSION WHATSNEW.txt
+%doc PFIF.txt README README.Coding README.contributing VERSION WHATSNEW.txt
 %doc docs-ja/docs-xml/output/htmldocs
 %{_bindir}/eventlogadm
 %{_bindir}/mvxattr
@@ -813,7 +814,7 @@ fi
 %{_mandir}/man8/vfs_acl_tdb.8*
 %{_mandir}/man8/vfs_acl_xattr.8*
 %{_mandir}/man8/vfs_aio_fork.8*
-%{_mandir}/man8/vfs_aio_linux.8*
+#{_mandir}/man8/vfs_aio_linux.8*
 %{_mandir}/man8/vfs_aio_pthread.8*
 %{_mandir}/man8/vfs_audit.8*
 %{_mandir}/man8/vfs_btrfs.8*
@@ -835,6 +836,7 @@ fi
 %{_mandir}/man8/vfs_linux_xfs_sgid.8*
 %{_mandir}/man8/vfs_media_harmony.8*
 %{_mandir}/man8/vfs_netatalk.8*
+%{_mandir}/man8/vfs_nfs4acl_xattr.8*
 %{_mandir}/man8/vfs_offline.8*
 %{_mandir}/man8/vfs_prealloc.8*
 %{_mandir}/man8/vfs_preopen.8*
@@ -851,6 +853,7 @@ fi
 %{_mandir}/man8/vfs_time_audit.8*
 %{_mandir}/man8/vfs_tsmsm.8*
 %{_mandir}/man8/vfs_unityed_media.8*
+%{_mandir}/man8/vfs_virusfilter.8*
 %{_mandir}/man8/vfs_worm.8*
 %{_mandir}/man8/vfs_xattr_tdb.8*
 # ja manuals
@@ -863,7 +866,7 @@ fi
 %{_mandir}/ja/man8/vfs_acl_tdb.8*
 %{_mandir}/ja/man8/vfs_acl_xattr.8*
 %{_mandir}/ja/man8/vfs_aio_fork.8*
-%{_mandir}/ja/man8/vfs_aio_linux.8*
+%exclude %{_mandir}/ja/man8/vfs_aio_linux.8*
 %{_mandir}/ja/man8/vfs_aio_pthread.8*
 %{_mandir}/ja/man8/vfs_audit.8*
 %{_mandir}/ja/man8/vfs_btrfs.8*
@@ -930,11 +933,12 @@ fi
 %{_libdir}/samba/libCHARSET3-samba4.so
 %{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so
 %{_libdir}/samba/libMESSAGING-samba4.so
+%{_libdir}/samba/libMESSAGING-SEND-samba4.so
 %{_libdir}/samba/libaddns-samba4.so
 %{_libdir}/samba/libads-samba4.so
 %{_libdir}/samba/libasn1-samba4.so.*
 %{_libdir}/samba/libasn1util-samba4.so
-%{_libdir}/samba/libauth-sam-reply-samba4.so
+#{_libdir}/samba/libauth-sam-reply-samba4.so
 %{_libdir}/samba/libauth-samba4.so
 %{_libdir}/samba/libauth-unix-token-samba4.so
 %{_libdir}/samba/libauth4-samba4.so
@@ -948,7 +952,9 @@ fi
 %{_libdir}/samba/libcliauth-samba4.so
 %{_libdir}/samba/libcluster-samba4.so
 %{_libdir}/samba/libcmdline-credentials-samba4.so
+%{_libdir}/samba/libcmocka-samba4.so
 %{_libdir}/samba/libcom_err-samba4.so*
+%{_libdir}/samba/libcommon-auth-samba4.so
 %{_libdir}/samba/libdb-glue-samba4.so
 %{_libdir}/samba/libdbwrap-samba4.so
 %{_libdir}/samba/libdcerpc-samba-samba4.so
@@ -959,7 +965,7 @@ fi
 %{_libdir}/samba/libevents-samba4.so
 %{_libdir}/samba/libflag-mapping-samba4.so
 %{_libdir}/samba/libgensec-samba4.so
-%{_libdir}/samba/libgpo-samba4.so
+%{_libdir}/samba/libgpext-samba4.so
 %{_libdir}/samba/libgse-samba4.so
 %{_libdir}/samba/libgssapi-samba4.so.*
 %{_libdir}/samba/libhcrypto-samba4.so.*
@@ -1039,6 +1045,7 @@ fi
 ## --------------------------------------------------------------------
 %files common
 %defattr(-,root,root)
+%doc smb.conf.example
 #%{_libdir}/samba/charset ???
 #%{_sysconfdir}/tmpfiles.d/samba.conf
 %{_bindir}/net
@@ -1053,7 +1060,7 @@ fi
 %attr(700,root,root) %dir /var/lib/samba/private
 %attr(755,root,root) %dir /var/lib/samba/msg
 %attr(755,root,root) %dir %{_sysconfdir}/samba
-%config(noreplace) %{_sysconfdir}/samba/smb.conf
+%ghost %config(noreplace) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %{_sysconfdir}/samba/lmhosts
 %config(noreplace) %{_sysconfdir}/sysconfig/samba
 %{_mandir}/man1/profiles.1.gz
@@ -1097,6 +1104,7 @@ fi
 %{_sbindir}/samba
 %{_sbindir}/samba_kcc
 %{_sbindir}/samba_dnsupdate
+%{_sbindir}/samba_gpoupdate
 %{_sbindir}/samba_spnupdate
 %{_sbindir}/samba_upgradedns
 %{_initrddir}/samba
@@ -1113,6 +1121,7 @@ fi
 %{_datadir}/samba/setup
 %{_mandir}/man8/samba.8*
 %{_mandir}/man8/samba-tool.8*
+%{_mandir}/man8/samba_gpoupdate.8*
 # ja manuals
 %{_mandir}/ja/man8/samba.8*
 %{_mandir}/ja/man8/samba-tool.8*
@@ -1216,6 +1225,8 @@ fi
 %{_mandir}/man1/smbtree.1.gz
 %{_mandir}/man5/smbgetrc.5.gz
 %{_mandir}/man5/smbpasswd.5.gz
+%{_mandir}/man7/traffic_learner.7.gz
+%{_mandir}/man7/traffic_replay.7.gz
 %{_mandir}/man8/cifsdd.8.gz
 %{_mandir}/man8/samba-regedit.8.gz
 %{_mandir}/man8/smbpasswd.8.gz
@@ -1266,87 +1277,91 @@ fi
 ## --------------------------------------------------------------------
 %files devel
 %defattr(-,root,root)
-%{_includedir}/samba-4.0/charset.h
-%{_includedir}/samba-4.0/core/doserr.h
-%{_includedir}/samba-4.0/core/error.h
-%{_includedir}/samba-4.0/core/hresult.h
-%{_includedir}/samba-4.0/core/ntstatus.h
-%{_includedir}/samba-4.0/core/werror.h
-%{_includedir}/samba-4.0/credentials.h
-%{_includedir}/samba-4.0/dcerpc.h
-%{_includedir}/samba-4.0/domain_credentials.h
-%{_includedir}/samba-4.0/gen_ndr/atsvc.h
-%{_includedir}/samba-4.0/gen_ndr/auth.h
-%{_includedir}/samba-4.0/gen_ndr/dcerpc.h
-%{_includedir}/samba-4.0/gen_ndr/krb5pac.h
-%{_includedir}/samba-4.0/gen_ndr/lsa.h
-%{_includedir}/samba-4.0/gen_ndr/misc.h
-%{_includedir}/samba-4.0/gen_ndr/nbt.h
-%{_includedir}/samba-4.0/gen_ndr/drsblobs.h
-%{_includedir}/samba-4.0/gen_ndr/drsuapi.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_drsblobs.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_drsuapi.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_atsvc.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_dcerpc.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_krb5pac.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_misc.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_nbt.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_samr.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_samr_c.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_svcctl.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_svcctl_c.h
-%{_includedir}/samba-4.0/gen_ndr/netlogon.h
-%{_includedir}/samba-4.0/gen_ndr/samr.h
-%{_includedir}/samba-4.0/gen_ndr/security.h
-%{_includedir}/samba-4.0/gen_ndr/server_id.h
-%{_includedir}/samba-4.0/gen_ndr/svcctl.h
-%{_includedir}/samba-4.0/ldb_wrap.h
-%{_includedir}/samba-4.0/lookup_sid.h
-%{_includedir}/samba-4.0/machine_sid.h
-%{_includedir}/samba-4.0/ndr.h
-%dir %{_includedir}/samba-4.0/ndr
-%{_includedir}/samba-4.0/ndr/ndr_dcerpc.h
-%{_includedir}/samba-4.0/ndr/ndr_drsblobs.h
-%{_includedir}/samba-4.0/ndr/ndr_drsuapi.h
-%{_includedir}/samba-4.0/ndr/ndr_krb5pac.h
-%{_includedir}/samba-4.0/ndr/ndr_svcctl.h
-%{_includedir}/samba-4.0/ndr/ndr_nbt.h
-%{_includedir}/samba-4.0/netapi.h
-%{_includedir}/samba-4.0/param.h
-%{_includedir}/samba-4.0/passdb.h
-%{_includedir}/samba-4.0/policy.h
-%{_includedir}/samba-4.0/rpc_common.h
-%{_includedir}/samba-4.0/samba/session.h
-%{_includedir}/samba-4.0/samba/version.h
-%{_includedir}/samba-4.0/share.h
-%{_includedir}/samba-4.0/smb2_lease_struct.h
-%{_includedir}/samba-4.0/smbconf.h
-%{_includedir}/samba-4.0/smb_ldap.h
-%{_includedir}/samba-4.0/smbldap.h
-%{_includedir}/samba-4.0/tdr.h
-%{_includedir}/samba-4.0/tsocket.h
-%{_includedir}/samba-4.0/tsocket_internal.h
-%dir %{_includedir}/samba-4.0/util
-%{_includedir}/samba-4.0/util/attr.h
-%{_includedir}/samba-4.0/util/blocking.h
-%{_includedir}/samba-4.0/util/byteorder.h
-%{_includedir}/samba-4.0/util/data_blob.h
-%{_includedir}/samba-4.0/util/debug.h
-%{_includedir}/samba-4.0/util/fault.h
-%{_includedir}/samba-4.0/util/genrand.h
-%{_includedir}/samba-4.0/util/idtree.h
-%{_includedir}/samba-4.0/util/idtree_random.h
-%{_includedir}/samba-4.0/util/memory.h
-%{_includedir}/samba-4.0/util/safe_string.h
-%{_includedir}/samba-4.0/util/signal.h
-%{_includedir}/samba-4.0/util/string_wrappers.h
-%{_includedir}/samba-4.0/util/substitute.h
-%{_includedir}/samba-4.0/util/talloc_stack.h
-%{_includedir}/samba-4.0/util/tevent_ntstatus.h
-%{_includedir}/samba-4.0/util/tevent_unix.h
-%{_includedir}/samba-4.0/util/tevent_werror.h
-%{_includedir}/samba-4.0/util/time.h
-%{_includedir}/samba-4.0/util_ldb.h
+%{samba_includedir}/charset.h
+%{samba_includedir}/core/doserr.h
+%{samba_includedir}/core/error.h
+%{samba_includedir}/core/hresult.h
+%{samba_includedir}/core/ntstatus.h
+%{samba_includedir}/core/ntstatus_gen.h
+%{samba_includedir}/core/werror.h
+%{samba_includedir}/core/werror_gen.h
+%{samba_includedir}/credentials.h
+%{samba_includedir}/dcerpc.h
+%{samba_includedir}/dcerpc_server.h
+%{samba_includedir}/domain_credentials.h
+%{samba_includedir}/gen_ndr/atsvc.h
+%{samba_includedir}/gen_ndr/auth.h
+%{samba_includedir}/gen_ndr/dcerpc.h
+%{samba_includedir}/gen_ndr/krb5pac.h
+%{samba_includedir}/gen_ndr/lsa.h
+%{samba_includedir}/gen_ndr/misc.h
+%{samba_includedir}/gen_ndr/nbt.h
+%{samba_includedir}/gen_ndr/drsblobs.h
+%{samba_includedir}/gen_ndr/drsuapi.h
+%{samba_includedir}/gen_ndr/ndr_drsblobs.h
+%{samba_includedir}/gen_ndr/ndr_drsuapi.h
+%{samba_includedir}/gen_ndr/ndr_atsvc.h
+%{samba_includedir}/gen_ndr/ndr_dcerpc.h
+%{samba_includedir}/gen_ndr/ndr_krb5pac.h
+%{samba_includedir}/gen_ndr/ndr_misc.h
+%{samba_includedir}/gen_ndr/ndr_nbt.h
+%{samba_includedir}/gen_ndr/ndr_samr.h
+%{samba_includedir}/gen_ndr/ndr_samr_c.h
+%{samba_includedir}/gen_ndr/ndr_svcctl.h
+%{samba_includedir}/gen_ndr/ndr_svcctl_c.h
+%{samba_includedir}/gen_ndr/netlogon.h
+%{samba_includedir}/gen_ndr/samr.h
+%{samba_includedir}/gen_ndr/security.h
+%{samba_includedir}/gen_ndr/server_id.h
+%{samba_includedir}/gen_ndr/svcctl.h
+%{samba_includedir}/ldb_wrap.h
+%{samba_includedir}/lookup_sid.h
+%{samba_includedir}/machine_sid.h
+%{samba_includedir}/ndr.h
+%dir %{samba_includedir}/ndr
+%{samba_includedir}/ndr/ndr_dcerpc.h
+%{samba_includedir}/ndr/ndr_drsblobs.h
+%{samba_includedir}/ndr/ndr_drsuapi.h
+%{samba_includedir}/ndr/ndr_krb5pac.h
+%{samba_includedir}/ndr/ndr_svcctl.h
+%{samba_includedir}/ndr/ndr_nbt.h
+%{samba_includedir}/netapi.h
+%{samba_includedir}/param.h
+%{samba_includedir}/passdb.h
+%{samba_includedir}/policy.h
+%{samba_includedir}/rpc_common.h
+%{samba_includedir}/samba/session.h
+%{samba_includedir}/samba/version.h
+%{samba_includedir}/share.h
+%{samba_includedir}/smb2_lease_struct.h
+%{samba_includedir}/smbconf.h
+%{samba_includedir}/smb_ldap.h
+%{samba_includedir}/smbldap.h
+%{samba_includedir}/tdr.h
+%{samba_includedir}/tsocket.h
+%{samba_includedir}/tsocket_internal.h
+%dir %{samba_includedir}/util
+%{samba_includedir}/util/attr.h
+%{samba_includedir}/util/blocking.h
+%{samba_includedir}/util/byteorder.h
+%{samba_includedir}/util/data_blob.h
+%{samba_includedir}/util/debug.h
+%{samba_includedir}/util/fault.h
+%{samba_includedir}/util/genrand.h
+%{samba_includedir}/util/idtree.h
+%{samba_includedir}/util/idtree_random.h
+%{samba_includedir}/util/memory.h
+%{samba_includedir}/util/safe_string.h
+%{samba_includedir}/util/signal.h
+%{samba_includedir}/util/string_wrappers.h
+%{samba_includedir}/util/substitute.h
+%{samba_includedir}/util/talloc_stack.h
+%{samba_includedir}/util/tevent_ntstatus.h
+%{samba_includedir}/util/tevent_unix.h
+%{samba_includedir}/util/tevent_werror.h
+%{samba_includedir}/util/tfork.h
+%{samba_includedir}/util/time.h
+%{samba_includedir}/util_ldb.h
 %{_libdir}/libdcerpc-binding.so
 %{_libdir}/libdcerpc-samr.so
 %{_libdir}/libdcerpc.so
@@ -1377,7 +1392,6 @@ fi
 %{_libdir}/pkgconfig/samba-util.pc
 %{_libdir}/pkgconfig/samdb.pc
 
-%{_includedir}/samba-4.0/dcerpc_server.h
 %{_libdir}/libdcerpc-server.so
 %{_libdir}/pkgconfig/dcerpc_server.pc
 
@@ -1412,7 +1426,7 @@ fi
 ## --------------------------------------------------------------------
 %files -n libsmbclient-devel
 %defattr(-,root,root)
-%{_includedir}/samba-4.0/libsmbclient.h
+%{samba_includedir}/libsmbclient.h
 %{_libdir}/libsmbclient.so
 %{_libdir}/pkgconfig/smbclient.pc
 #%{_mandir}/man7/libsmbclient.7*
@@ -1428,7 +1442,7 @@ fi
 ## --------------------------------------------------------------------
 %files -n libwbclient-devel
 %defattr(-,root,root)
-%{_includedir}/samba-4.0/wbclient.h
+%{samba_includedir}/wbclient.h
 %{_libdir}/samba/wbclient/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 %endif # with_libwbclient
@@ -1460,11 +1474,12 @@ fi
 %{_libdir}/samba/libCHARSET3-samba4.so
 %{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so
 %{_libdir}/samba/libMESSAGING-samba4.so
+%{_libdir}/samba/libMESSAGING-SEND-samba4.so
 %{_libdir}/samba/libaddns-samba4.so
 %{_libdir}/samba/libads-samba4.so
 %{_libdir}/samba/libasn1-samba4.so.*
 %{_libdir}/samba/libasn1util-samba4.so
-%{_libdir}/samba/libauth-sam-reply-samba4.so
+#{_libdir}/samba/libauth-sam-reply-samba4.so
 %{_libdir}/samba/libauth-samba4.so
 %{_libdir}/samba/libauth-unix-token-samba4.so
 %{_libdir}/samba/libauth4-samba4.so
@@ -1478,6 +1493,9 @@ fi
 %{_libdir}/samba/libcliauth-samba4.so
 %{_libdir}/samba/libcluster-samba4.so
 %{_libdir}/samba/libcmdline-credentials-samba4.so
+%{_libdir}/samba/libcmocka-samba4.so
+%{_libdir}/samba/libcom_err-samba4.so*
+%{_libdir}/samba/libcommon-auth-samba4.so
 %{_libdir}/samba/libdb-glue-samba4.so
 %{_libdir}/samba/libdbwrap-samba4.so
 %{_libdir}/samba/libdcerpc-samba-samba4.so
@@ -1489,7 +1507,7 @@ fi
 %{_libdir}/samba/libflag-mapping-samba4.so
 %{_libdir}/samba/libgenrand-samba4.so
 %{_libdir}/samba/libgensec-samba4.so
-%{_libdir}/samba/libgpo-samba4.so
+%{_libdir}/samba/libgpext-samba4.so
 %{_libdir}/samba/libgse-samba4.so
 %{_libdir}/samba/libgssapi-samba4.so.*
 %{_libdir}/samba/libhcrypto-samba4.so.*
@@ -1569,6 +1587,13 @@ fi
 %endif
 
 %changelog
+* Wed Mar 14 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.8.0-1
+- new upstream release.
+
+* Thu Mar 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.8.0-0.2.rc4
+- new upstream release.
+- fixed %%files for compat32-samba-libs.
+
 * Mon Jul 17 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.6.6-1
 - new upstream release.
 - updated samba-ja-docs.