From 572ac5fea9f9406f7671741e61dcd372142441de Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 11 Dec 2003 06:08:04 +0000 Subject: fix bug when installing pam config file on RedHat; remove references to /var/cache/samba in Fedora specfile (This used to be commit 91a540079796dd64283a6ebdb3c69b0a7975ffff) --- packaging/Fedora/samba.spec.tmpl | 1 - packaging/RedHat/samba.spec.tmpl | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'packaging') diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl index c5956889f0..ec50cc705b 100644 --- a/packaging/Fedora/samba.spec.tmpl +++ b/packaging/Fedora/samba.spec.tmpl @@ -348,7 +348,6 @@ fi %{_bindir}/smbcquotas #%{_bindir}/vfstest %{_sbindir}/winbindd -%dir /var/cache/samba %config(noreplace) %{_sysconfdir}/samba/smb.conf %config(noreplace) %{_sysconfdir}/samba/lmhosts %dir %{_datadir}/samba diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl index 034c909fb7..550ab9304b 100644 --- a/packaging/RedHat/samba.spec.tmpl +++ b/packaging/RedHat/samba.spec.tmpl @@ -185,9 +185,6 @@ install -m755 packaging/RedHat/smb.init $RPM_BUILD_ROOT%{prefix}/sbin/samba install -m644 packaging/RedHat/samba.log $RPM_BUILD_ROOT/etc/logrotate.d/samba install -m644 packaging/RedHat/smb.conf $RPM_BUILD_ROOT/etc/samba/smb.conf install -m644 packaging/RedHat/smbusers $RPM_BUILD_ROOT/etc/samba/smbusers -install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba -install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/samba/samba.stack -install -m644 packaging/RedHat/samba.xinetd $RPM_BUILD_ROOT/etc/samba/samba.xinetd echo 127.0.0.1 localhost > $RPM_BUILD_ROOT/etc/samba/lmhosts # Remove "*.old" files @@ -293,9 +290,7 @@ fi # Add swat entry to xinetd.d if needed. if [ -d /etc/xinetd.d -a ! -f /etc/xinetd.d/swat ]; then - mv /etc/samba/samba.xinetd /etc/xinetd.d/swat -else - rm -f /etc/samba/samba.xinetd + install -m644 packaging/RedHat/samba.xinetd $RPM_BUILD_ROOT/etc/xinetd.d/swat fi # Install the correct version of the samba pam file, depending on pam version. @@ -303,10 +298,10 @@ fi if [ ! -f /etc/pam.d/samba ]; then if [ -f /lib/security/pam_stack.so ]; then echo "Installing stack version of /etc/pam.d/samba..." - mv /etc/samba/samba.stack /etc/pam.d/samba + install -m644 packaging/RedHat/samba.pamd.stack $RPM_BUILD_ROOT/etc/pam.d/samba else echo "Installing non-stack version of /etc/pam.d/samba..." - rm -f /etc/samba/samba.stack + install -m644 packaging/RedHat/samba.pamd $RPM_BUILD_ROOT/etc/pam.d/samba fi fi @@ -444,8 +439,6 @@ fi %config(noreplace) /etc/samba/lmhosts %config(noreplace) /etc/samba/smb.conf %config(noreplace) /etc/samba/smbusers -/etc/samba/samba.stack -/etc/samba/samba.xinetd /etc/rc.d/init.d/smb /etc/rc.d/init.d/winbind /etc/logrotate.d/samba -- cgit