- %%userremove/%%groupremove support, some standarization

Changed files:
    geneweb.spec -> 1.4

diff --git a/geneweb.spec b/geneweb.spec
index 19ab76713f91e8a6e4cb8a33674595c4d8400fe1..50c580775e1f55171e9637bea9833b845f97893c 100644 (file)
--- a/geneweb.spec
+++ b/geneweb.spec
@@ -20,15 +20,18 @@ Source1:    %{name}.init
 URL:           http://cristal.inria.fr/~ddr/GeneWeb/
 BuildRequires: ocaml
 BuildRequires: ocaml-camlp4
+BuildRequires: rpmbuild(macros) >= 1.159
 PreReq:                rc-scripts
-Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires(post,preun):  /sbin/chkconfig
 Requires(post):        fileutils
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
+Provides:      group(geneweb)
+Provides:      user(geneweb)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -94,23 +97,24 @@ touch $RPM_BUILD_ROOT/var/log/gwsetup.log
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if [ -n "`getgid %{name}`" ]; then
-       if [ "`getgid %{name}`" != "129" ]; then
-               echo "Error: group %{name} doesn't have gid=129. Correct this before installing %{name}." 1>&2
+if [ -n "`/usr/bin/getgid geneweb`" ]; then
+       if [ "`/usr/bin/getgid geneweb`" != 129 ]; then
+               echo "Error: group geneweb doesn't have gid=129. Correct this before installing %{name}." 1>&2
                exit 1
        fi
 else
-       echo "Adding group %{name} GID=129."
-       /usr/sbin/groupadd -g 129 -r -f %{name}
+       echo "Adding group geneweb GID=129."
+       /usr/sbin/groupadd -g 129 geneweb
 fi
-if [ -n "`id -u %{name} 2>/dev/null`" ]; then
-       if [ "`id -u %{name}`" != "129" ]; then
-               echo "Error: user %{name} doesn't have uid=129. Correct this before installing %{name}." 1>&2
+if [ -n "`/bin/id -u geneweb 2>/dev/null`" ]; then
+       if [ "`/bin/id -u geneweb`" != 129 ]; then
+               echo "Error: user geneweb doesn't have uid=129. Correct this before installing %{name}." 1>&2
                exit 1
        fi
 else
        echo "Adding user %{name} UID=129."
-       /usr/sbin/useradd -u 129 -r -d /var/lib/%{name} -s /bin/false -c "Genealogy Software" -g %{name} %{name} 1>&2
+       /usr/sbin/useradd -u 129 -d /var/lib/geneweb -s /bin/false \
+               -c "Genealogy Software" -g geneweb geneweb 1>&2
 fi
 
 %post
@@ -134,10 +138,8 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-       echo "Removing user %{name}."
-       /usr/sbin/userdel %{name}
-       echo "Removing group %{name}."
-       /usr/sbin/groupdel %{name}
+       %userremove geneweb
+       %groupremove geneweb
 fi
 
 %files