From bceb895aa4f82851a7475e7e6218587c8eddb6a4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 17 Jun 2010 10:53:56 +0200 Subject: [PATCH] Revert "v3-4-ctdb: Do not do any logrotation" This reverts commit 0ce0f33c9bfdb9d0a5364e3902926fcc3a6d8ae1. --- packaging/RHEL-CTDB/samba.spec.tmpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 9e470e81aa..0296a56eee 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -23,6 +23,7 @@ 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 @@ -313,8 +314,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}/{pam.d,samba} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d} +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}/rc.d/init.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{samba,sysconfig} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d @@ -364,6 +365,7 @@ 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 @@ -458,6 +460,7 @@ 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 -- 2.34.1