[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3943-g8343dd5

Michael Adam obnox at samba.org
Fri Aug 29 16:03:10 GMT 2008 

The branch, v3-devel has been updated
       via  8343dd5c3a124b9c705f2b71e3747542e193da7e (commit)
       via  f570071e558f09a3155e9065ec7c73c83e27fd1a (commit)
       via  f48070b8798db7be1197dba18b759cf50eb121d8 (commit)
       via  590744d6ca78624334a1b351bb7ade2de3047afc (commit)
       via  54e3a6dcb2aaa8dc07d3cfbfb9abb950428b1010 (commit)
       via  a87c0cc084a583d6eafac9fc83093ef29ba9809a (commit)
       via  8686ceb9ada5ed3239edccd830ab6aeb007e6750 (commit)
       via  d18075524fa6b83fbb86aa0010c6190136e99865 (commit)
      from  81cc1af1e699e454fbb1d12636d002f845231006 (commit)

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


- Log -----------------------------------------------------------------
commit 8343dd5c3a124b9c705f2b71e3747542e193da7e
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 28 17:36:48 2008 +0200

    packaging(RHEL-CTDB): add the cifs.upcall manpage to package.
    
    Michael

commit f570071e558f09a3155e9065ec7c73c83e27fd1a
Author: Michael Adam <obnox at samba.org>
Date:   Thu Aug 28 17:14:45 2008 +0200

    packaging(RHEL-CTDB): Add the ldbtools' manpages to the package.
    
    Michael

commit f48070b8798db7be1197dba18b759cf50eb121d8
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 15:53:00 2008 +0200

    packaging(RHEL-CTDB): fix direction of symlink for libnss_winbind.so.2
    
    This is a workaround, until we have proper creation
    of libnss_winbind.so.2 and .so as a symlink from the Makefile.
    
    Michael

commit 590744d6ca78624334a1b351bb7ade2de3047afc
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 15:52:03 2008 +0200

    packaging(RHEL-CTDB): move libnss_winbind.so bits closer together
    
    and comment on commented out libnss_wins.so installation
    
    Michael

commit 54e3a6dcb2aaa8dc07d3cfbfb9abb950428b1010
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 12:58:06 2008 +0200

    packaging(RHEL-CTDB): remove duplicate installation of pam_smbpass.so
    
    Michael

commit a87c0cc084a583d6eafac9fc83093ef29ba9809a
Author: Michael Adam <obnox at samba.org>
Date:   Fri Aug 29 15:16:42 2008 +0200

    packaging(RHEL-CTDB): remove library packaging hacks due to fixed Makfile.
    
    Use --libdir instead of --with-libdir .
    Use new --with-modulesdir to separate LIBDIR and MODULESDIR.
    
    This makes post "make install" hacks unnecessary.
    
    Michael

commit 8686ceb9ada5ed3239edccd830ab6aeb007e6750
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 12:10:07 2008 +0200

    packaging(RHEL-CTDB): remove unused variable from makerpms.sh
    
    Michael

commit d18075524fa6b83fbb86aa0010c6190136e99865
Author: Michael Adam <obnox at samba.org>
Date:   Wed Aug 27 12:09:40 2008 +0200

    packaging(RHEL-CTDB): auto-detect samba version from spec in makerpms.sh
    
    Michael

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

Summary of changes:
 packaging/RHEL-CTDB/makerpms.sh |    7 ++--
 packaging/RHEL-CTDB/samba.spec  |   69 ++++++++------------------------------
 2 files changed, 18 insertions(+), 58 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 8a0345b..485c810 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -21,9 +21,10 @@ SRCDIR=`rpm --eval %_sourcedir`
 
 # At this point the SPECDIR and SRCDIR variables must have a value!
 
-VERSION='3.3.0'
-REVISION='ctdb'
+DIRNAME=$(dirname $0)
+
 SPECFILE="samba.spec"
+VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
 DOCS="docs.tar.bz2"
 RPMVER=`rpm --version | awk '{print $3}'`
 RPM="rpmbuild"
@@ -41,8 +42,6 @@ case $RPMVER in
        ;;
 esac
 
-DIRNAME=$(dirname $0)
-
 pushd ${DIRNAME}/../..
 echo -n "Creating samba-${VERSION}.tar.bz2 ... "
 git archive --prefix=samba-${VERSION}/ HEAD | bzip2 > ${SRCDIR}/samba-${VERSION}.tar.bz2
diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec
index 16340c6..5f5edad 100644
--- a/packaging/RHEL-CTDB/samba.spec
+++ b/packaging/RHEL-CTDB/samba.spec
@@ -147,7 +147,8 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
 	--prefix=%{_prefix} \
 	--localstatedir=/var \
         --with-configdir=%{_sysconfdir}/samba \
-        --with-libdir=%{_libarchdir}/samba \
+        --libdir=%{_libarchdir} \
+	--with-modulesdir=%{_libarchdir}/samba \
         --with-lockdir=/var/lib/samba \
         --with-logfilebase=/var/log/samba \
         --with-mandir=%{_mandir} \
@@ -229,67 +230,21 @@ make DESTDIR=$RPM_BUILD_ROOT \
         install
 cd ..
 
-# pam_smbpass
-cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
-
 # NSS & PAM winbind support
 install -m 755 source/bin/pam_winbind.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_winbind.so
-install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so
-#install -m 755 source/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
+install -m 755 source/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
 ( cd $RPM_BUILD_ROOT/%{_libarch};
-  ln -sf libnss_winbind.so  libnss_winbind.so.2 )
+  ln -sf libnss_winbind.so.2  libnss_winbind.so )
+#
+# do not install libnss_wins.so in order to reduce dependencies
+# (we do not need it for the samba-ctdb scenario)
+#
+#install -m 755 source/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 )
 
-# make install puts libsmbclient.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.so* $RPM_BUILD_ROOT/usr/lib*/samba/libsmbclient.a || true
-install -m 755 source/bin/libsmbclient.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.so.0
-install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.a
-install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
-ln -s libsmbclient.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbclient.so
-
-# make install puts libmsrpc.so in the wrong place on x86_64
-#rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-#install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.so
-#install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.a
-#install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-#rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libmsrpc.*
-#ln -s /%{_libarchdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libarchdir}/libmsrpc.so.0
-
-# make install puts libsmbsharemodes.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so* $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
-install -m 755 source/bin/libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.so.0
-install -m 755 source/bin/libsmbsharemodes.a $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.a
-install -m 644 source/include/smb_share_modes.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libsmbsharemodes.*
-ln -s libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libsmbsharemodes.so
-
 # Install pam_smbpass.so
 install -m755 source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_libarch}/security/pam_smbpass.so
 
-# Put the shared libraries to their SONAME under /usr/lib{,64}
-# and create the proper .so symlinks
-#
-# libwbclient
-rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libwbclient.so*
-install -m 755 source/bin/libwbclient.so.0 \
-	$RPM_BUILD_ROOT%{_libarchdir}/libwbclient.so.0
-ln -s libwbclient.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libwbclient.so
-# libtalloc
-rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libtalloc.so*
-install -m 755 source/bin/libtalloc.so.1 \
-	$RPM_BUILD_ROOT%{_libarchdir}/libtalloc.so.1
-ln -s libtalloc.so.1 $RPM_BUILD_ROOT%{_libarchdir}/libtalloc.so
-# libtdb
-rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libtdb.so*
-install -m 755 source/bin/libtdb.so.1 \
-	$RPM_BUILD_ROOT%{_libarchdir}/libtdb.so.1
-ln -s libtdb.so.1 $RPM_BUILD_ROOT%{_libarchdir}/libtdb.so
-# libnetapi
-rm -f $RPM_BUILD_ROOT%{_libarchdir}/samba/libnetapi.so*
-install -m 755 source/bin/libnetapi.so.0 \
-	$RPM_BUILD_ROOT%{_libarchdir}/libnetapi.so.0
-ln -s libnetapi.so.0 $RPM_BUILD_ROOT%{_libarchdir}/libnetapi.so
-
 ## cleanup
 /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
 
@@ -552,6 +507,12 @@ exit 0
 %{_mandir}/man8/net.8*
 %{_mandir}/man7/pam_winbind.7*
 %{_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}/man8/cifs.upcall.8*
 
 %ifarch i386 i486 i586 i686 ppc s390
 %files winbind-32bit


-- 
Samba Shared Repository

More information about the samba-cvs mailing list