From e51b72648082360526eaf34f6dacb96751f3592d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 02:58:34 +0000 Subject: [PATCH] auto-import changelog data from am-utils-6.0.9-9.src.rpm Wed Sep 01 2004 Nalin Dahyabhai 6.0.9-9 - really fix %preun this time --- am-utils.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/am-utils.spec b/am-utils.spec index 3209f9d..813ba19 100644 --- a/am-utils.spec +++ b/am-utils.spec @@ -1,7 +1,7 @@ Summary: Automount utilities including an updated version of Amd. Name: am-utils Version: 6.0.9 -Release: 8 +Release: 9 License: BSD Epoch: 5 Group: System Environment/Daemons @@ -87,13 +87,16 @@ rm -rf $RPM_BUILD_ROOT %pre # Check if we have an old fashioned amd.conf and rename if to amd.net -if [ "$1" -ne "0" ] ; then - if grep -q "auto_dir" /etc/amd.conf 2>/dev/null ; then +if [ "$1" -ne 0 ] ; then + if ! test -r /etc/amd.conf ; then + # this is okay + exit 0 + elif grep -q "auto_dir" /etc/amd.conf 2>/dev/null ; then # this is okay exit 0 else # this needs to be renamed. Still, if /etc/amd.net exists, then - # don't bother renamig it. RPM will handle it better than us here. + # don't bother renaming it. RPM will handle it better than us here. if [ -e /etc/amd.net ] ; then exit 0 else @@ -109,7 +112,7 @@ exit 0 /sbin/install-info %{_infodir}/am-utils.info.gz %{_infodir}/dir %preun -if [ $1 -ne 0 ]; then +if [ $1 -eq 0 ]; then /sbin/install-info --delete %{_infodir}/am-utils.info.gz %{_infodir}/dir /sbin/service amd stop >/dev/null 2>&1 /sbin/chkconfig --del amd @@ -139,6 +142,9 @@ fi %{_libdir}/libamu.so.* %changelog +* Wed Sep 1 2004 Nalin Dahyabhai 6.0.9-9 +- really fix %%preun this time + * Tue Aug 31 2004 Nalin Dahyabhai 6.0.9-8 - rebuild