[SCM] Samba Shared Repository - branch master updated

Michael Adam obnox at samba.org
Fri Feb 12 15:16:53 MST 2010


The branch, master has been updated
       via  72242ef... packaging(RHEL-CTDB): adapt configure.rpm to match the spec-file configure call
       via  a6338c0... v3-4-ctdb: Do not do any logrotation
      from  a752bbd... s3:registry: eliminate race condition in creating/scanning sorted subkeys

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 72242ef7cd6d2c9b4cc4f82ef1138560cad78df1
Author: Michael Adam <obnox at samba.org>
Date:   Tue Feb 9 08:00:06 2010 +0100

    packaging(RHEL-CTDB): adapt configure.rpm to match the spec-file configure call
    
    Michael

commit a6338c01b7a20b2e4786c74d3cc00027e23420e7
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jan 14 18:26:01 2010 +0100

    v3-4-ctdb: Do not do any logrotation

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

Summary of changes:
 packaging/RHEL-CTDB/configure.rpm   |    3 ++-
 packaging/RHEL-CTDB/samba.spec.tmpl |    7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm
index 84e7346..61276f8 100755
--- a/packaging/RHEL-CTDB/configure.rpm
+++ b/packaging/RHEL-CTDB/configure.rpm
@@ -30,7 +30,8 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure -C \
 	--prefix=${_prefix} \
 	--localstatedir=/var \
 	--with-configdir=${_sysconfdir}/samba \
-	--with-libdir=${_libarchdir}/samba \
+	--libdir=${_libarchdir} \
+	--with-modulesdir=${_libarchdir}/samba \
 	--with-pammodulesdir=/${_libarch}/security \
 	--with-lockdir=/var/lib/samba \
 	--with-logfilebase=/var/log/samba \
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index a22bfbd..4978cfa 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -24,7 +24,6 @@ Prereq: fileutils sed /etc/init.d
 
 Requires: pam >= 0.64 %{auth} 
 Requires: samba-common = %{version}-%{release}
-Requires: logrotate >= 3.4 initscripts >= 5.54-1
 Provides: samba = %{version}
 
 Prefix: /usr
@@ -300,8 +299,8 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/{bin,sbin}
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
 mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{logrotate.d,pam.d,samba}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,logrotate.d}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,samba}
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{samba,sysconfig}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
@@ -351,7 +350,6 @@ rm -rf %{_32bit_tmp_dir}
 # Install the miscellany
 echo 127.0.0.1 localhost > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
 
-install -m644 setup/samba.log $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/samba
 install -m644 setup/swat $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/swat
 install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb
@@ -450,7 +448,6 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/samba
 %config(noreplace) %{_sysconfdir}/samba/smbusers
 %attr(755,root,root) %config %{initdir}/smb
-%config(noreplace) %{_sysconfdir}/logrotate.d/samba
 %config(noreplace) %{_sysconfdir}/pam.d/samba
 
 %attr(0755,root,root) %dir /var/log/samba


-- 
Samba Shared Repository


More information about the samba-cvs mailing list