From 03e60efcc1b58ee8c1b47b7dd529970cb82d0277 Mon Sep 17 00:00:00 2001
From: Steven Pritchard <steve@fedoraproject.org>
Date: Fri, 12 Dec 2008 02:52:09 +0000
Subject: [PATCH] Attempt to fix BZ#476129.

---
 openvpn.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/openvpn.spec b/openvpn.spec
index 8b68d90..04a784b 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.29%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.30%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/beta/%{name}-%{version}%{?prerelease:_%{prerelease}}.tar.gz
@@ -135,9 +135,10 @@ mkdir -m 755 -p $RPM_BUILD_ROOT%{_var}/run/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-if ! id openvpn > /dev/null 2>&1 ; then
-    /usr/sbin/useradd -r -s /sbin/nologin -c OpenVPN -d /etc/openvpn openvpn
-fi
+getent group openvpn &>/dev/null || groupadd -r openvpn
+getent passwd openvpn &>/dev/null || \
+    /usr/sbin/useradd -r -g openvpn -s /sbin/nologin -c OpenVPN \
+        -d /etc/openvpn openvpn
 
 %post
 /sbin/chkconfig --add %{name}
@@ -168,10 +169,13 @@ fi
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
-* Sat Nov 29 2008 Robert Scheck <robert@fedoraproject.org> 2.1-0.29
+* Thu Dec 11 2008 Steven Pritchard <steve@kspei.com> 2.1-0.30.rc15
+- Attempt to fix BZ#476129.
+
+* Sat Nov 29 2008 Robert Scheck <robert@fedoraproject.org> 2.1-0.29.rc15
 - Update to 2.1_rc15
 
-* Wed Aug 13 2008 Steven Pritchard <steve@kspei.com> 2.1-0.28
+* Wed Aug 13 2008 Steven Pritchard <steve@kspei.com> 2.1-0.28.rc9
 - Add "--script-security 2" by default for backwards compatibility
   (see bug #458594).