[samba4] Keep more libraries in samba4-libs and make conflicting as builtin.

Milan Crha mcrha at fedoraproject.org
Thu Aug 11 09:29:30 UTC 2011 

commit 9fed68eac23d1a880f981e5478198985148c3d82
Author: Milan Crha <mcrha at redhat.com>
Date:   Thu Aug 11 11:29:08 2011 +0200

    Keep more libraries in samba4-libs and make conflicting as builtin.

 samba4.spec |   62 ++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 40 insertions(+), 22 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 63d2631..8d955dd 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 35
+%define main_release 36
 %define samba4_version 4.0.0
 
 %define talloc_version 2.0.5
@@ -10,7 +10,7 @@
 
 %define tarball_name samba-%{samba4_version}%{pre_release}
 
-%define samba4_release %{main_release}%{pre_release}%{?dist}
+%define samba4_release %{main_release}.%{pre_release}%{?dist}
 
 # Most of these subpackages are disabled because they are not
 # needed by OpenChange, and to avoid file conflicts with Samba3.
@@ -186,6 +186,7 @@ domains and to use Windows user and group accounts on Linux.
         --datadir=%{_datadir}/samba \
 	--disable-gnutls \
 	--disable-rpath-install \
+	--builtin-libraries=ccan,wbclient \
 	--bundled-libraries=heimdal,!talloc,!tdb,!tevent,!ldb,!zlib
 
 # Build PIDL for installation into vendor directories before
@@ -195,7 +196,7 @@ domains and to use Windows user and group accounts on Linux.
 # Builds using PIDL the IDL and many other things.
 #make proto
 #make everything
-make
+make -j
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -245,8 +246,8 @@ rm $RPM_BUILD_ROOT%{_bindir}/ntlm_auth
 rm $RPM_BUILD_ROOT%{_bindir}/wbinfo
 rm $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so.2
 rm $RPM_BUILD_ROOT%{_libdir}/pam_winbind.so
-rm $RPM_BUILD_ROOT%{_libdir}/libwbclient.so
-rm $RPM_BUILD_ROOT%{_libdir}/libwbclient.so.*
+#rm $RPM_BUILD_ROOT%{_libdir}/libwbclient.so
+#rm $RPM_BUILD_ROOT%{_libdir}/libwbclient.so.*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/ntlm_auth.*
 rm $RPM_BUILD_ROOT%{_includedir}/samba-4.0/wbclient.h
 %endif
@@ -337,39 +338,38 @@ rm $RPM_BUILD_ROOT%{_libdir}/samba/auth/script.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/idmap/autorid.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/ldb/dirsync.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libCHARSET3.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_CLDAP.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_LSA3.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_RAW.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_SMB_COMMON.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_CLDAP.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_LSA3.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_RAW.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_SMB_COMMON.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBSMB.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libPOPT_SAMBA3.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libUTIL_CMDLINE.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libUTIL_TDB.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libUTIL_TDB.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libaddns.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libads.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libadt_tree.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libasn1util.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libauth_sam_reply.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libasn1util.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libauth_sam_reply.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libbitmap.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libccan.so.0
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libccan.so.0.1-init-1161-g661d41f
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libcli-ldap-common.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libccan.so.0
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libccan.so.0.1-init-1161-g661d41f
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libcli-ldap-common.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libdbwrap_util.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libflag_mapping.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libinterfaces.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libinterfaces.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libmemcache.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc3.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libnamearray.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libnpa_tstream.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libnpa_tstream.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libpassdb.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libsmbd_base.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libsmbd_conn.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libsmbd_shim.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libsmbregistry.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libstring_init.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libtdb_compat.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libtdb_compat.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_malloc.so
-rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_reg.so
+#rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_reg.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_sec.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_str.so
 rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/acl_tdb.so
@@ -660,12 +660,27 @@ exit 0
 %{_libdir}/samba/service/winbind.so
 %{_libdir}/samba/service/wrepl.so
 
+%{_libdir}/samba/libLIBCLI_CLDAP.so
+%{_libdir}/samba/libLIBCLI_LSA3.so
+%{_libdir}/samba/libLIBCLI_RAW.so
+%{_libdir}/samba/libLIBCLI_SMB_COMMON.so
+%{_libdir}/samba/libUTIL_TDB.so
+%{_libdir}/samba/libflag_mapping.so
+%{_libdir}/samba/libasn1util.so
+%{_libdir}/samba/libauth_sam_reply.so
+%{_libdir}/samba/libcli-ldap-common.so
+%{_libdir}/samba/libflag_mapping.so
+%{_libdir}/samba/libinterfaces.so
+%{_libdir}/samba/libnpa_tstream.so
+%{_libdir}/samba/libtdb_compat.so
+%{_libdir}/samba/libutil_reg.so
+
 %if %enable_winbind
 %files winbind
 %defattr(-,root,root,-)
 %{_bindir}/ntlm_auth
 %{_bindir}/wbinfo
-%{_libdir}/libwbclient.so.0
+#%{_libdir}/libwbclient.so.0
 %{_libdir}/libnss_winbind.so.2
 %{_libdir}/libnss-winbind.inst.so.2
 %{_libdir}/pam_winbind.so
@@ -786,7 +801,7 @@ exit 0
 %{_includedir}/samba-4.0/ndr/ndr_svcctl.h
 
 %if %enable_winbind
-%{_libdir}/libwbclient.so
+#%{_libdir}/libwbclient.so
 %{_includedir}/samba-4.0/wbclient.h
 %endif
 
@@ -826,6 +841,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Aug 11 2011 Milan Crha <mcrha at redhat.com> - 4.0.0-36.alpha16
+- Keep more libraries in samba4-libs and make conflicting as builtin.
+
 * Tue Aug  2 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-35.alpha16
 - Rebase to new upstream release.
   This release is needed to build newer openchange libraries.

More information about the scm-commits mailing list