diff options
| author | Gerald Carter <jerry@samba.org> | 2003-12-11 15:58:33 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-12-11 15:58:33 +0000 |
| commit | 24c7ace8e1ef085160c4916d0ec841633f6a75d0 (patch) | |
| tree | c3db15310c003d5f8363c92a85fd85571aba06b9 /packaging | |
| parent | 0827745b2cdaa12d192eb694687f6e846e9d7afd (diff) | |
| download | samba-24c7ace8e1ef085160c4916d0ec841633f6a75d0.tar.gz | |
sync compiler warning fixes from 3.0; packaging updates; and start on WHATSNEW for 3.0.1 final
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/Fedora/samba.spec.tmpl | 1 | ||||
| -rw-r--r-- | packaging/RedHat/samba.spec.tmpl | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/packaging/Fedora/samba.spec.tmpl b/packaging/Fedora/samba.spec.tmpl index c5956889f0a..ec50cc705b4 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 034c909fb7f..550ab9304b3 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 |