RPM installation compatibility for non-'-r' groupadd(8)/useradd(8).

diff --git a/captive.spec.in b/captive.spec.in
index a1a7ec3..ef38363 100644 (file)
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -142,8 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-/usr/sbin/groupadd -r captive 2>/dev/null || true
-/usr/sbin/useradd -c "Captive Sandbox" -s /sbin/nologin -r -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || true
+/usr/sbin/groupadd -r captive 2>/dev/null || \
+   /usr/sbin/groupadd captive 2>/dev/null || \
+        true
+/usr/sbin/useradd -r -c "Captive Sandbox" -s /sbin/nologin -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
+   /usr/sbin/useradd -c "Captive Sandbox" -s /sbin/nologin -g captive -d %{_var}/lib/@PACKAGE@ captive 2>/dev/null || \
+   true
 
 %postun
 /sbin/ldconfig