[rpms/ejabberd] f45: Move away from fedora-usermgmt

[rpms/ejabberd] f45: Move away from fedora-usermgmt

[Peter Lemenkov]

            A new commit has been pushed.

            Repo   : rpms/ejabberd
            Branch : f45
            Commit : d8d424561d09c92ad1e35e30669d7af7be552687
            Author : Peter Lemenkov <lemenkov@gmail.com>
            Date   : 2013-09-16T14:03:15+04:00
            Stats  : +8/-9 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/ejabberd/c/d8d424561d09c92ad1e35e30669d7af7be552687?branch=f45

            Log:
            Move away from fedora-usermgmt

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---
diff --git a/ejabberd.spec b/ejabberd.spec
index f451716..0eed25f 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -4,7 +4,6 @@
 %global patchnumber 0
 
 
-%global uid 27
 %global _hardened_build 1
 
 
@@ -67,7 +66,6 @@ BuildRequires:  expat-devel
 BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  pam-devel
 BuildRequires:  erlang
-BuildRequires:	fedora-usermgmt-devel
 %if 0%{?with_hevea}
 BuildRequires:  hevea
 BuildRequires:  texlive
@@ -76,7 +74,9 @@ BuildRequires:  texlive-comment
 BuildRequires:	autoconf
 BuildRequires:	automake
 
-%{?FE_USERADD_REQ}
+# For creating user and group
+Requires(pre):		shadow-utils
+
 Requires(post): /usr/bin/openssl
 %if 0%{?el5}%{?el6}
 Requires(post): /sbin/chkconfig
@@ -89,9 +89,6 @@ Requires(preun): systemd
 Requires(postun): systemd
 %endif
 
-Provides: user(%{name}) = %{uid}
-Provides: group(%{name}) = %{uid}
-
 #Error:erlang(exmpp_jid:domain_as_list/1)
 #Error:erlang(exmpp_jid:make/2)
 #Error:erlang(exmpp_jid:node_as_list/1)
@@ -240,9 +237,10 @@ rm -rf %{buildroot}%{_defaultdocdir}
 
 
 %pre
-%{__fe_groupadd} %{uid} -r %{name} &>/dev/null || :
-%{__fe_useradd} %{uid} -r -s /sbin/nologin -d /var/lib/ejabberd -M \
-			-c 'ejabberd' -g %{name} %{name} &>/dev/null || :
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -M \
+-c "ejabberd" %{name} 2>/dev/null || :
 
 
 if [ $1 -gt 1 ]; then
@@ -424,6 +422,7 @@ rm -rf %{buildroot}
 * Thu Sep 05 2013 Peter Lemenkov <lemenkov@gmail.com> - 2.1.13-3
 - TEMPORARY disable hevea - it's broken in F19+
 - Fix building with unversioned docdir
+- Move away from fedora-usermgmt
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.13-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild