[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - a87e63fef46b01d406da6b616dfd2508b07ca833

[Michael Adam]

The branch, v3-4-ctdb has been updated
       via  a87e63fef46b01d406da6b616dfd2508b07ca833 (commit)
       via  a2a8408a5bf54da673bf17b4397a1e272bd409f2 (commit)
       via  9bae183d4ea8c119bbaabe3bfccfa1cc2449dd70 (commit)
       via  161943b61ab98abc6d3613f6e8294c0d0efd501d (commit)
       via  ab1eda044d1f453f2794340ab1bce3bc762eb187 (commit)
       via  2d7fa7698b941509adb0d612d69c0e1540b3ad08 (commit)
      from  580e1a1c22797f890873c4045f3cd4fe5d38f20f (commit)

http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb


- Log -----------------------------------------------------------------
commit a87e63fef46b01d406da6b616dfd2508b07ca833
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 15:30:42 2009 +0200

    packaging(RHEL-CTDB): move the idmap and nss_info modules to the common package
    
    In this layout, this is the package that contains winbindd related stuff.
    
    Michael

commit a2a8408a5bf54da673bf17b4397a1e272bd409f2
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 14:32:52 2009 +0200

    packaging(RHEL-CTDB): package the winbind_krb5_locator.so plugin
    
    Michael

commit 9bae183d4ea8c119bbaabe3bfccfa1cc2449dd70
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 14:05:42 2009 +0200

    packaging(RHEL-CTDB): package the manpage of the winbind_krb5_locator plugin
    
    Michael

commit 161943b61ab98abc6d3613f6e8294c0d0efd501d
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 14:04:33 2009 +0200

    packaging(RHEL-CTDB): package the manpage of "ldbrename"
    
    Michael

commit ab1eda044d1f453f2794340ab1bce3bc762eb187
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 14:04:09 2009 +0200

    packaging(RHEL-CTDB): package the manpage of "sharesec"
    
    Michael

commit 2d7fa7698b941509adb0d612d69c0e1540b3ad08
Author: Michael Adam <obnox at samba.org>
Date:   Mon Aug 3 13:45:40 2009 +0200

    packaging(RHEL-CTDB): pam_winbindd man page has moved from section 7 to 8
    
    This due to updating the docs tarball to the 3.4 docs.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 packaging/RHEL-CTDB/samba.spec.tmpl |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index 0df0bc1..a84a5cf 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -296,6 +296,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{samba,sysconfig}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
 mkdir -p $RPM_BUILD_ROOT/var/{log,run/winbindd,spool}/samba
+mkdir -p $RPM_BUILD_ROOT/%{_libarchdir}/krb5/plugins/libkrb5
 
 cd source3
 make DESTDIR=$RPM_BUILD_ROOT \
@@ -313,6 +314,7 @@ install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_win
 #install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
 # ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so  libnss_wins.so.2 )
 
+cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/plugins/libkrb5
 
 # install files for winbind-32bit package
 %ifarch x86_64 ppc64
@@ -454,8 +456,6 @@ exit 0
 %{_bindir}/tdbdump
 %{_bindir}/eventlogadm
 
-%{_libarchdir}/samba/idmap/*.so
-%{_libarchdir}/samba/nss_info/*.so
 %{_libarchdir}/samba/vfs/*.so
 %{_libarchdir}/samba/auth/*.so
 
@@ -472,7 +472,6 @@ exit 0
 %{_mandir}/man8/tdbtool.8*
 %{_mandir}/man8/eventlogadm.8*
 %{_mandir}/man8/vfs_*.8*
-%{_mandir}/man8/idmap_*.8*
 
 
 ##########
@@ -530,6 +529,7 @@ exit 0
 %{_mandir}/man1/smbclient.1*
 %{_mandir}/man1/smbtar.1*
 %{_mandir}/man1/smbtree.1*
+%{_mandir}/man1/sharesec.1*
 
 ##########
 
@@ -548,6 +548,9 @@ exit 0
 %attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
 /usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
 
+%{_libarchdir}/samba/idmap/*.so
+%{_libarchdir}/samba/nss_info/*.so
+
 %{_includedir}/libsmbclient.h
 %{_libarchdir}/libsmbclient.*
 #%{_includedir}/libmsrpc.h
@@ -567,6 +570,8 @@ exit 0
 %{_libarchdir}/libtdb.so*
 %{_libarchdir}/libwbclient.so*
 
+%{_libarchdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
+
 %{_sbindir}/winbind
 
 %{_sbindir}/winbindd
@@ -595,13 +600,16 @@ exit 0
 %{_mandir}/man1/wbinfo.1*
 %{_mandir}/man8/winbindd.8*
 %{_mandir}/man8/net.8*
-%{_mandir}/man7/pam_winbind.7*
+%{_mandir}/man8/pam_winbind.8*
 %{_mandir}/man7/libsmbclient.7*
 %{_mandir}/man1/ldbadd.1*
 %{_mandir}/man1/ldbdel.1*
 %{_mandir}/man1/ldbedit.1*
 %{_mandir}/man1/ldbmodify.1*
 %{_mandir}/man1/ldbsearch.1*
+%{_mandir}/man1/ldbrename.1*
+%{_mandir}/man7/winbind_krb5_locator.7*
+%{_mandir}/man8/idmap_*.8*
 
 %ifarch x86_64 ppc64
 %files winbind-32bit


-- 
SAMBA-CTDB repository