From: misi3k <misi3k@pld-linux.org>
Date: Sat, 20 Sep 2003 08:51:53 +0000 (+0000)
Subject: - fix group add in pre section
X-Git-Tag: gdm-2_4_4_3-3~10
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=d5d47785cc3277cbd5887bfa72dbcc641a51a31f;p=packages%2Fgdm2.20.git

- fix group add in pre section

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

diff --git a/gdm.spec b/gdm.spec
index 764c758..d998de3 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -167,7 +167,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -g 55 -r -f xdm
+if [ -n "`getgid xdm`" ]; then
+	if [ "`getgid xdm`" != "55" ]; then
+                echo "Error: group xdm doesn't have gid=55. Correct this before installing %{name}." 1>&2
+                exit 1
+        fi
+else
+	/usr/sbin/groupadd -g 55 -r -f xdm
+fi
+
 
 if [ -z "`id -u xdm 2>/dev/null`" ]; then
        /usr/sbin/useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
diff --git a/gdm2.20.spec b/gdm2.20.spec
index 764c758..d998de3 100644
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -167,7 +167,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -g 55 -r -f xdm
+if [ -n "`getgid xdm`" ]; then
+	if [ "`getgid xdm`" != "55" ]; then
+                echo "Error: group xdm doesn't have gid=55. Correct this before installing %{name}." 1>&2
+                exit 1
+        fi
+else
+	/usr/sbin/groupadd -g 55 -r -f xdm
+fi
+
 
 if [ -z "`id -u xdm 2>/dev/null`" ]; then
        /usr/sbin/useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2