rpms/openvpn/devel openvpn.spec,1.41,1.42

[Steven Pritchard]

Author: steve

Update of /cvs/pkgs/rpms/openvpn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25947

Modified Files:
	openvpn.spec 
Log Message:
Attempt to fix BZ#476129.


Index: openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- openvpn.spec	30 Nov 2008 14:27:28 -0000	1.41
+++ openvpn.spec	12 Dec 2008 02:52:09 -0000	1.42
@@ -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 @@
 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 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
-* Sat Nov 29 2008 Robert Scheck <robert at fedoraproject.org> 2.1-0.29
+* Thu Dec 11 2008 Steven Pritchard <steve at kspei.com> 2.1-0.30.rc15
+- Attempt to fix BZ#476129.
+
+* Sat Nov 29 2008 Robert Scheck <robert at fedoraproject.org> 2.1-0.29.rc15
 - Update to 2.1_rc15
 
-* Wed Aug 13 2008 Steven Pritchard <steve at kspei.com> 2.1-0.28
+* Wed Aug 13 2008 Steven Pritchard <steve at kspei.com> 2.1-0.28.rc9
 - Add "--script-security 2" by default for backwards compatibility
   (see bug #458594).