[samba4] Update to Samba 4.0.0 beta1.

[asn]

commit a050cd870864e0d156db34b8e96b6d3ec7caa45c
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Tue Jun 5 15:09:48 2012 +0200

    Update to Samba 4.0.0 beta1.

 .gitignore                                |    1 +
 samba4-alpha21-enable-dcerpc-server.patch |  240 -----------------------------
 samba4.spec                               |   35 +++--
 sources                                   |    2 +-
 4 files changed, 23 insertions(+), 255 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e73c09b..42b6887 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ samba-4.0.0alpha11.tar.gz
 /samba-4.0.0alpha15-GIT-a6a722b.tar.gz
 /samba-4.0.0alpha18.tar.bz2
 /samba-4.0.0alpha21.tar.bz2
+/samba-4.0.0beta1.tar.bz2
diff --git a/samba4.spec b/samba4.spec
index acf2b3d..cd2b381 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,11 +1,11 @@
-%define main_release 52
+%define main_release 53
 
 %define samba_version 4.0.0
 %define talloc_version 2.0.7
 %define tdb_version 1.2.10
 %define tevent_version 0.9.15
 %define ldb_version 1.1.6
-%define pre_release alpha21
+%define pre_release beta1
 
 %define samba_release %{main_release}%{pre_release}%{?dist}
 
@@ -76,7 +76,6 @@ Source102: winbind.init
 Source200: README.dc
 
 Patch1: samba4-libpdb-soversion.patch
-Patch2: samba4-alpha21-enable-dcerpc-server.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -354,7 +353,6 @@ link against the SMB, RPC and other protocols.
 %setup -q -n samba-%{version}%{pre_release}
 
 %patch1 -p1 -b .waf_tdb
-%patch2 -p1 -b .enable_dcerpc-server
 
 %build
 %define _talloc_lib %nil
@@ -505,6 +503,7 @@ install -m 0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sys
 %if ! %with_dc
 install -d -m 0755 %{buildroot}%{_defaultdocdir}/%{name}
 install -m 0644 %{SOURCE200} %{buildroot}%{_defaultdocdir}/%{name}/README.dc
+install -m 0644 %{SOURCE200} %{buildroot}%{_defaultdocdir}/%{name}/README.dc-libs
 %endif
 
 %if 0%{?fedora} > 15 || 0%{?rhel} > 6
@@ -720,6 +719,7 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libaddns.so
 %{_libdir}/samba/libads.so
 %{_libdir}/samba/libasn1util.so
+%{_libdir}/samba/libauth4.so
 %{_libdir}/samba/libauth_sam_reply.so
 %{_libdir}/samba/libauth_unix_token.so
 %{_libdir}/samba/libauthkrb5.so
@@ -729,7 +729,7 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libcli_cldap.so
 %{_libdir}/samba/libcli_smb_common.so
 %{_libdir}/samba/libcliauth.so
-%{_libdir}/samba/libclidns.so
+#%{_libdir}/samba/libclidns.so
 %{_libdir}/samba/libcluster.so
 %{_libdir}/samba/libcmdline-credentials.so
 %{_libdir}/samba/libdbwrap.so
@@ -771,7 +771,6 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libutil_cmdline.so
 %{_libdir}/samba/libutil_reg.so
 %{_libdir}/samba/libutil_tdb.so
-%{_libdir}/samba/libwrap_xattr.so
 %{_libdir}/samba/libxattr_tdb.so
 
 %if %with_dc
@@ -889,16 +888,17 @@ rm -rf %{buildroot}
 
 %files dc-libs
 %defattr(-,root,root)
-%{_libdir}/libdcerpc-server.so.*
-%{_libdir}/samba/libauth4.so
+%if %with_dc
 %{_libdir}/samba/libprocess_model.so
 %{_libdir}/samba/libservice.so
 %{_libdir}/samba/process_model
 %{_libdir}/samba/service
-%if %with_dc
+%{_libdir}/libdcerpc-server.so.*
 %{_libdir}/samba/libntvfs.so
 %{_libdir}/samba/libposix_eadb.so
 %{_libdir}/samba/bind9/dlz_bind9_9.so
+%else
+%doc %{_defaultdocdir}/%{name}/README.dc-libs
 %endif # with_dc
 
 %files winbind
@@ -949,7 +949,7 @@ rm -rf %{buildroot}
 %{_bindir}/debug2html
 %{_bindir}/log2pcap
 %{_bindir}/nmblookup
-%{_bindir}/nmblookup3
+%{_bindir}/nmblookup4
 %{_bindir}/oLschema2ldif
 %{_bindir}/regdiff
 %{_bindir}/regpatch
@@ -959,7 +959,7 @@ rm -rf %{buildroot}
 %{_bindir}/sharesec
 %{_bindir}/smbcacls
 %{_bindir}/smbclient
-%{_bindir}/smbclient3
+%{_bindir}/smbclient4
 %{_bindir}/smbcquotas
 %{_bindir}/smbfilter
 %{_bindir}/smbget
@@ -1045,7 +1045,6 @@ rm -rf %{buildroot}
 %{_includedir}/samba-4.0/core/werror.h
 %{_includedir}/samba-4.0/credentials.h
 %{_includedir}/samba-4.0/dcerpc.h
-%{_includedir}/samba-4.0/dcerpc_server.h
 %{_includedir}/samba-4.0/dlinklist.h
 %{_includedir}/samba-4.0/domain_credentials.h
 %{_includedir}/samba-4.0/gen_ndr/atsvc.h
@@ -1147,7 +1146,6 @@ rm -rf %{buildroot}
 %{_libdir}/libdcerpc-atsvc.so
 %{_libdir}/libdcerpc-binding.so
 %{_libdir}/libdcerpc-samr.so
-%{_libdir}/libdcerpc-server.so
 %{_libdir}/libdcerpc.so
 %{_libdir}/libgensec.so
 %{_libdir}/libndr-krb5pac.so
@@ -1168,12 +1166,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/dcerpc.pc
 %{_libdir}/pkgconfig/dcerpc_atsvc.pc
 %{_libdir}/pkgconfig/dcerpc_samr.pc
-%{_libdir}/pkgconfig/dcerpc_server.pc
 %{_libdir}/pkgconfig/gensec.pc
 %{_libdir}/pkgconfig/ndr.pc
 %{_libdir}/pkgconfig/ndr_krb5pac.pc
 %{_libdir}/pkgconfig/ndr_nbt.pc
 %{_libdir}/pkgconfig/ndr_standard.pc
+%{_libdir}/pkgconfig/netapi.pc
 %{_libdir}/pkgconfig/registry.pc
 %{_libdir}/pkgconfig/samba-credentials.pc
 %{_libdir}/pkgconfig/samba-hostconfig.pc
@@ -1184,6 +1182,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/torture.pc
 %{_libdir}/samba/libpdb.so
 
+%if %with_dc
+%{_includedir}/samba-4.0/dcerpc_server.h
+%{_libdir}/libdcerpc-server.so
+%{_libdir}/pkgconfig/dcerpc_server.pc
+%endif
+
 %if %with_talloc
 %{_includedir}/samba-4.0/pytalloc.h
 %endif
@@ -1248,6 +1252,9 @@ rm -rf %{buildroot}
 %endif # with_libwbclient
 
 %changelog
+* Tue Jun 05 2012 Andreas Schneider <asn at redhat.com>- 2:4.0.0-53.beta1
+- Update to Samba 4.0.0 beta1.
+
 * Mon Jun 04 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-52.alpha21
 - Add missing conflict for samba-swat.
 - Fix packaging of internal libraries to reflect alpha21 changes.
diff --git a/sources b/sources
index 0ea830b..07b8c29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdbad6688083c77618c528b5a1d60961  samba-4.0.0alpha21.tar.bz2
+83d92d59ce5c87b8eef7f5f4b22453d2  samba-4.0.0beta1.tar.bz2