@@ -1,7 +1,7 @@

 Summary:        RPC program number mapper

 Name:           rpcbind

 Version:        0.2.4

-Release:        4%{?dist}

+Release:        5%{?dist}

 License:        BSD

 URL:            http://nfsv4.bullopensource.org

 Group:          Applications/Daemons

@@ -64,14 +64,13 @@ make %{?_smp_mflags} check

 %{_libdir}/systemd/system-preset/50-rpcbind.preset

 %pre

-rpcid=`getent passwd rpc | cut -d: -f 3`

-if [ -n "$rpcid" -a "$rpcid" != "31" ]; then

-    userdel  rpc 2> /dev/null || :

-    groupdel rpc 2> /dev/null || :

-fi

-if [ -z "$rpcid" -o "$rpcid" != "31" ]; then

-    groupadd -g 31 rpc > /dev/null 2>&1

+getent group rpc >/dev/null || groupadd -f -g 31 -r rpc

+if ! getent passwd rpc >/dev/null ; then

+if ! getent passwd 31 >/dev/null ; then

     useradd -d /var/lib/rpcbind -g rpc -s /bin/false -u 31 rpc > /dev/null 2>&1

+else

+    useradd -d /var/lib/rpcbind -g rpc -s /bin/false rpc > /dev/null 2>&1

+fi

 fi

 %preun

 %systemd_preun rpcbind.service rpcbind.socket

@@ -95,6 +94,8 @@ fi

 rm -rf %{buildroot}/*

 %changelog

+*   Tue Mar 06 2018 Xiaolin Li <xiaolinl@vmware.com> 0.2.4-5

+-   Fix pre install script.

 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 0.2.4-4

 -   Remove coreutils from requires and use explicit tools for post actions

 *   Thu Jun 29 2017 Divya Thaluru <dthaluru@vmware.com>  0.2.4-3