- stop serwice in %preun only when /var/lock/subsys/autofs exist,

- small cosmetic changes.

Changed files:
    autofs.spec -> 1.15

diff --git a/autofs.spec b/autofs.spec
index db9704ce8d9d8f638fee3de943f7e61e7fc4080c..6cd9b10985621b39b60139f323b68bc5111a1602 100644 (file)
--- a/autofs.spec
+++ b/autofs.spec
@@ -5,7 +5,7 @@ Summary(pl):    Demon autofs
 Summary(tr):   autofs sunucu süreci
 Name:          autofs
 Version:       3.1.3
-Release:       4
+Release:       5
 Copyright:     GPL
 Group:         Daemons
 Group(pl):     Serwery
@@ -16,16 +16,13 @@ Buildroot:  /tmp/%{name}-%{version}-root
 Prereq:                /sbin/chkconfig
 Requires:      mktemp
 
+%define                _sysconfdir     /etc/autofs
+
 %description
 autofs is a daemon which automatically mounts filesystems when you use
 them, and unmounts them later when you are not using them.  This can
 include network filesystems, CD-ROMs, floppies, and so forth.
 
-%description -l pl
-Autofs jest demonem, który montuje automatycznie systemy plików je¿eli
-je u¿ywasz i odmontowuje pó¼niej, je¿eli ich nie u¿ywasz. Mo¿e montowaæ
-sieciowy system plików, CD-romy, stacje dyskietek i inne.
-
 %description -l de
 autofs ist ein Dämon, der Dateisysteme automatisch montiert, wenn sie 
 benutzt werden, und sie später bei Nichtbenutzung wieder demontiert. 
@@ -36,6 +33,11 @@ autofs est un d
 lorsqu'on les utilise et les démonte lorsqu'on ne les utilise plus. Cela
 inclus les systèmes de fichiers réseau, les CD-ROMs, les disquettes, etc.
 
+%description -l pl
+Autofs jest demonem, który montuje automatycznie systemy plików je¿eli
+je u¿ywasz i odmontowuje pó¼niej, je¿eli ich nie u¿ywasz. Mo¿e montowaæ
+sieciowy system plików, CD-romy, stacje dyskietek i inne.
+
 %description -l tr
 autofs, kullanýlan dosya sistemlerini gerek olunca kendiliðinden baðlar
 ve kullanýmlarý sona erince yine kendiliðinden çözer. Bu iþlem, að dosya
@@ -46,10 +48,8 @@ sistemleri, CD-ROM'lar ve disketler 
 %patch -p1 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure %{_target_platform} \
-       --prefix=%{_prefix} \
-       --sysconfdir=/etc/autofs
+LDFLAGS="-s"; export LDFLAGS
+%configure
  
 make 
 
@@ -74,19 +74,20 @@ strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/autofs/*
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man[58]/* \
        NEWS README 
 
-%post -n autofs
+%post
 /sbin/chkconfig --add autofs
 if test -r /var/run/autofs.pid; then
-       /etc/rc.d/init.d/autofs stop >&2
-       /etc/rc.d/init.d/autofs start >&2
+       /etc/rc.d/init.d/autofs restart 1>&2
 else
        echo "Run \"/etc/rc.d/init.d/autofs start\" to start autofs daemon."
 fi
 
-%preun -n autofs
+%preun
 if [ "$1" = "0" ]; then
        /sbin/chkconfig --del autofs
-       /etc/rc.d/init.d/autofs stop >&2
+       if [ -f /var/lock/subsys/autofs ]; then
+               /etc/rc.d/init.d/autofs stop 1>&2
+       fi
 fi
 
 %clean
@@ -97,12 +98,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc {NEWS,README}.gz 
 
 %attr(754,root,root) %config /etc/rc.d/init.d/autofs
-%dir /etc/autofs
-%attr(644,root,root) %config %verify(not size mtime md5) /etc/autofs/*
+%dir %{_sysconfdir}
+%attr(644,root,root) %config %verify(not size mtime md5) %{_sysconfdir}/*
 %attr(755,root,root) %{_sbindir}/automount
 
 %dir /misc
-%dir %{_libdir}/autofs
 
+%dir %{_libdir}/autofs
 %attr(755,root,root) %{_libdir}/autofs/*
+
 %{_mandir}/man[58]/*