[tor/el6] Remove dependency on fedora-usermgmt-devel

[Jamie Nguyen]

commit 453f2f1a7ed1b44ab1ef4598c76ef8eef54db44b
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sat Dec 8 12:39:25 2012 +0000

    Remove dependency on fedora-usermgmt-devel

 tor.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/tor.spec b/tor.spec
index 326f699..af67cfb 100644
--- a/tor.spec
+++ b/tor.spec
@@ -1,14 +1,12 @@
 %global tor_user        toranon
 %global tor_group       toranon
-%global tor_uid         19
 %global tor_homedir     %{_sharedstatedir}/tor
 %global tor_logdir      %{_localstatedir}/log/tor
 %global _hardened_build 1
-%bcond_without fedora
 
 Name:              tor
 Version:           0.2.3.25
-Release:           1%{?dist}
+Release:           2%{?dist}
 
 Summary:           Anonymizing overlay network for TCP (The onion router)
 Group:             System Environment/Daemons
@@ -20,9 +18,9 @@ Source1:           https://www.torproject.org/dist/tor-%{version}.tar.gz.asc
 Source2:           tor.logrotate
 Source3:           tor.service
 
-BuildRequires:     fedora-usermgmt-devel
 BuildRequires:     libevent-devel >= 1.4.13
 BuildRequires:     openssl-devel >= 0.9.7
+Requires(pre):     shadow-utils
 Requires(post):    chkconfig
 Requires(preun):   chkconfig
 Requires(preun):   initscripts
@@ -85,9 +83,11 @@ install -p -D -m 0755 %{SOURCE3} %{buildroot}%{_initrddir}/tor
 
 %pre
 if [ $1 -eq 1 ]; then
-    %__fe_groupadd %{tor_uid} -r %{tor_user} &>/dev/null || :
-    %__fe_useradd %{tor_uid} -r -d %{tor_homedir} -g %{tor_group} \
-        -s /sbin/nologin -c "Tor client" %{tor_user} &>/dev/null || :
+    getent group %{tor_group} >/dev/null || groupadd -r %{tor_group}
+    getent passwd %{tor_user} >/dev/null || \
+        useradd -r -g %{tor_group} -d %{tor_homedir} -s /sbin/nologin \
+        -c "Tor client" %{tor_user}
+    exit 0
 fi
 
 %post
@@ -128,6 +128,9 @@ fi
 
 
 %changelog
+* Sat Dec 08 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-2
+- remove dependency on fedora-usermgmt-devel
+
 * Sun Nov 25 2012 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-1
 - rewrite package from scratch for simplicity and clarity
 - stick closer with upstream defaults