- reverting last change: removing new macros from %p{re,ost}{,un}

Changed files:
    glibc.spec -> 1.183

diff --git a/glibc.spec b/glibc.spec
index 5d1ecf875cf3ba981696ae0ddbe79880d7b5afa0..0a6dd4921c0bf48060e63aba0b7e94ab5c1d6b39 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -476,17 +476,27 @@ done
 %postun memusage -p /sbin/ldconfig
 
 %post devel
-%fix_info_dir
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %postun devel
-%fix_info_dir
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %post -n nscd
+/sbin/chkconfig --add nscd
 touch /var/log/nscd && (chown root.root /var/log/nscd ; chmod 640 /var/log/nscd)
-NAME=nscd; DESC="nscd daemon"; %chkconfig_add
+if [ -f /var/lock/subsys/nscd ]; then
+       /etc/rc.d/init.d/nscd restart 1>&2
+else
+       echo "Run \"/etc/rc.d/init.d/nscd start\" to start nscd daemon." 1>&2
+fi
 
 %preun -n nscd
-NAME=nscd; %chkconfig_del
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/nscd ]; then
+               /etc/rc.d/init.d/nscd stop 1>&2
+       fi
+       /sbin/chkconfig --del nscd
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT