From f7d930ffff13e0961d1c92ed4f67369e0f805366 Mon Sep 17 00:00:00 2001
From: Erinn Looney-Triggs <erinn.looneytriggs@gmail.com>
Date: Mar 06 2014 13:37:55 +0000
Subject: Modify %pre to more flexibly add the jetty user and group and add a comment for GECOS.


---

diff --git a/jetty.spec b/jetty.spec
index a78ca5f..dbde52b 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -55,7 +55,7 @@
 
 Name:           jetty
 Version:        9.1.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -736,9 +736,17 @@ ln -sf %{rundir} %{buildroot}%{homedir}/work
 
 %pre
 # Add the "jetty" user and group
-getent group  %username &>/dev/null || groupadd -r -g %jtuid %username || :
-getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
-                             -d %homedir -M -s /sbin/nologin %username || :
+getent group %username >/dev/null || groupadd -f -g %jtuid -r %username
+if ! getent passwd %username >/dev/null ; then
+    if ! getent passwd %jtuid >/dev/null ; then
+      useradd -r -u %jtuid -g %username -d %homedir -s /sbin/nologin \
+      -c "Jetty web server" %username
+    else
+      useradd -r -g %username -d %homedir -s /sbin/nologin \
+      -c "Jetty web server" %username
+    fi
+fi
+exit 0
 
 %post
 %systemd_post jetty.service
@@ -843,6 +851,10 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Thu Mar 06 2014 Erinn Looney-Triggs <erinn.looneytriggs@gmail.com> - 9.1.3-3
+- Adjust useradd to be more flexible as shown here:
+  https://fedoraproject.org/wiki/Packaging:UsersAndGroups
+
 * Thu Mar 06 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 9.1.3-2
 - Use Requires: java-headless rebuild (#1067528)