[java-sig-commits] [jetty] Use shadow-utils directly instead of fedora-usermgmt-devel

[Mikolaj Izdebski]

commit 15104e6e3cf57f3de4ffa5c33226570aedb075ac
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com&gt;
Date:   Tue May 15 06:53:07 2012 +0200

    Use shadow-utils directly instead of fedora-usermgmt-devel

 jetty.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index edfa7b6..03e7ee8 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -64,10 +64,6 @@ Patch5:         0005-Remove-pmd-plugin.patch
 Patch6:         0006-Remove-unpack-config-deps-from-distribution.patch
 Patch7:         0007-disable-jetty-osgi.patch
 
-%if 0%{?rhel} <= 0
-BuildRequires:  fedora-usermgmt-devel
-%{?FE_USERADD_REQ}
-%endif
 BuildRequires:  geronimo-annotation
 BuildRequires:  geronimo-jaspic-spec
 BuildRequires:  geronimo-jta
@@ -144,6 +140,7 @@ Requires:       jetty-xml              = %{version}-%{release}
 # Requires:       jetty-osgi             = %{version}-%{release}
 # %endif
 
+Requires(pre):    shadow-utils
 Requires(post):   systemd-units, systemd-sysv
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
@@ -790,9 +787,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %pre
 # Add the "jetty" user and group
-%__fe_groupadd %jtuid -r %username &>/dev/null || :
-%__fe_useradd  %jtuid -r -s /sbin/nologin -d %homedir -M          \
-                    -g %username %username &>/dev/null || :
+(getent group  %username || groupadd -r -g %jtuid %username) &>/dev/null || :
+(getent passwd %username || useradd  -r -u %jtuid -g %username -d %homedir \
+                              -M -s /sbin/nologin %username) &>/dev/null || :
 
 %post
 if [ $1 -eq 1 ] ; then
@@ -815,8 +812,8 @@ if [ $1 -ge 1 ] ; then
 fi
 # Remove the user even during upgrade, it will be added later in %post.
 # This is required to force incorrect UID to be replaced with the new one.
-%__fe_userdel  %username &>/dev/null || :
-%__fe_groupdel %username &>/dev/null || :
+userdel  %username &>/dev/null || :
+groupdel %username &>/dev/null || :
 
 
 %triggerun -- jetty < 8.1.0-3
@@ -1003,6 +1000,7 @@ fi
 * Wed May  9 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com&gt; - 8.1.2-6
 - Move start.ini to /etc
 - Require glassfish-jsp only when jetty-osgi is enabled
+- Use shadow-utils directly instead of fedora-usermgmt-devel
 
 * Mon Apr 30 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 8.1.2-5
 - Don't require subpackages not needed by server itself