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

Changed files:
    gdm.spec -> 1.35
    gdm2.20.spec -> 1.35

diff --git a/gdm.spec b/gdm.spec
index a299057f8c7e488373f5efcc66922957b58f203f..bffe4fdcfa7d0415eb4685b0e3088a35d5b1537a 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -88,19 +88,34 @@ gzip -9nf AUTHORS ChangeLog NEWS README TODO
 %find_lang %{name} --all-name --with-gnome
 
 %pre
-GROUP=xdm; GID=55; %groupadd
-USER=xdm; UID=55; HOMEDIR=/dev/null; COMMENT="X Display Manager"; %useradd
+/usr/sbin/groupadd -g 55 -r -f xdm
+
+if [ -z "`id -u xdm 2>/dev/null`" ]; then
+       /usr/sbin/useradd -u 55 -r -d /dev/null -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
+fi
 
 %post
-%chkconfig_add
+/sbin/chkconfig --add gdm
+if [ -f /var/lock/subsys/gdm ]; then
+        /etc/rc.d/init.d/gdm restart >&2
+else
+        echo "Run \"/etc/rc.d/init.d/gdm start\" to start gdm." >&2
+fi
 /usr/bin/scrollkeeper-update
 
 %preun
-%chkconfig_del
+if [ -f /var/lock/subsys/gdm ]; then
+                /etc/rc.d/init.d/gdm stop >&2
+fi
+/sbin/chkconfig --del gdm
 
 %postun
-USER=xdm; %userdel
-GROUP=xdm; %groupdel
+if [ "$1" = "0" ]; then
+       if [ -n "`id -u xdm 2>/dev/null`" ]; then
+               /usr/sbin/userdel xdm
+       fi
+       /usr/sbin/groupdel xdm
+fi
 /usr/bin/scrollkeeper-update
 
 %clean

diff --git a/gdm2.20.spec b/gdm2.20.spec
index a299057f8c7e488373f5efcc66922957b58f203f..bffe4fdcfa7d0415eb4685b0e3088a35d5b1537a 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -88,19 +88,34 @@ gzip -9nf AUTHORS ChangeLog NEWS README TODO
 %find_lang %{name} --all-name --with-gnome
 
 %pre
-GROUP=xdm; GID=55; %groupadd
-USER=xdm; UID=55; HOMEDIR=/dev/null; COMMENT="X Display Manager"; %useradd
+/usr/sbin/groupadd -g 55 -r -f xdm
+
+if [ -z "`id -u xdm 2>/dev/null`" ]; then
+       /usr/sbin/useradd -u 55 -r -d /dev/null -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
+fi
 
 %post
-%chkconfig_add
+/sbin/chkconfig --add gdm
+if [ -f /var/lock/subsys/gdm ]; then
+        /etc/rc.d/init.d/gdm restart >&2
+else
+        echo "Run \"/etc/rc.d/init.d/gdm start\" to start gdm." >&2
+fi
 /usr/bin/scrollkeeper-update
 
 %preun
-%chkconfig_del
+if [ -f /var/lock/subsys/gdm ]; then
+                /etc/rc.d/init.d/gdm stop >&2
+fi
+/sbin/chkconfig --del gdm
 
 %postun
-USER=xdm; %userdel
-GROUP=xdm; %groupdel
+if [ "$1" = "0" ]; then
+       if [ -n "`id -u xdm 2>/dev/null`" ]; then
+               /usr/sbin/userdel xdm
+       fi
+       /usr/sbin/groupdel xdm
+fi
 /usr/bin/scrollkeeper-update
 
 %clean