- revert user changes

Changed files:
    mysql.spec -> 1.161

diff --git a/mysql.spec b/mysql.spec
index 1054d84b36cac659033f13e58a0c865e28d3abd8..e0a63581c8b5ed773984ac231fdc6c2858fd0a83 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -46,7 +46,12 @@ BuildRequires:       texinfo
 BuildRequires: zlib-devel
 %{?_with_bdb:BuildRequires:    db3-devel}
 PreReq:                rc-scripts >= 0.2.0
-Requires(pre): user-mysql
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
 Requires(post,preun):  /sbin/chkconfig
 Provides:      MySQL-server
 Provides:      msqlormysql
@@ -383,6 +388,26 @@ mv -f $RPM_BUILD_ROOT%{_libdir}/mysql/lib* $RPM_BUILD_ROOT%{_libdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ -n "`getgid mysql`" ]; then
+       if [ "`getgid mysql`" != "89" ]; then
+               echo "Error: group mysql doesn't have gid=89. Correct this before installing mysql." 1>&2
+               exit 1
+       fi
+else
+       /usr/sbin/groupadd -g 89 -r -f mysql
+fi
+if [ -n "`id -u mysql 2>/dev/null`" ]; then
+       if [ "`id -u mysql`" != "89" ]; then
+               echo "Error: user mysql doesn't have uid=89. Correct this before installing mysql." 1>&2
+               exit 1
+       fi
+else
+       /usr/sbin/useradd -M -o -r -u 89 \
+                       -d /home/services/mysql -s /bin/sh -g mysql \
+                       -c "MySQL Server" mysql 1>&2
+fi
+
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 /sbin/chkconfig --add mysql
@@ -402,6 +427,10 @@ fi
 
 %postun
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+if [ "$1" = "0" ]; then
+       /usr/sbin/userdel mysql
+       /usr/sbin/groupdel mysql
+fi
 
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig