rpms/openldap/devel openldap.spec,1.145,1.146

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24680

Modified Files:
	openldap.spec 
Log Message:
Updated spec file - correct installation of openldap group


Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- openldap.spec	21 Aug 2009 14:54:10 -0000	1.145
+++ openldap.spec	25 Aug 2009 08:58:12 -0000	1.146
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -82,7 +82,7 @@ customized LDAP clients.
 Summary: LDAP server
 # OpenLDAP server includes Berkeley DB library, which is licensed under Sleepycat and BSD licenses)
 License: OpenLDAP and (Sleepycat and BSD)
-Requires: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
+Requires: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/useradd, /usr/sbin/groupadd, /sbin/chkconfig, /sbin/runuser
 Group: System Environment/Daemons
 
 %description servers
@@ -405,7 +405,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre servers
 # Take care to only do ownership-changing if we're adding the user.
-if /usr/sbin/useradd -c "LDAP User" -u 55 \
+getent group ldap > /dev/null || \
+/usr/sbin/groupadd -r -g 55 ldap
+if /usr/sbin/useradd -c "LDAP User" -u 55 -g ldap \
     -s /sbin/nologin -r -d /var/lib/ldap ldap 2> /dev/null ; then
     if [ -d /var/lib/ldap ] ; then
         for dbfile in /var/lib/ldap/* ; do
@@ -604,6 +606,9 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue Aug 25 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.16-4
+- updated %pre script to correctly install openldap group
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.4.16-3
 - rebuilt with new openssl