diff --git a/openldap2-client.changes b/openldap2-client.changes index 02d3d15..c4005e1 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 22 13:41:56 UTC 2014 - tchvatal@suse.com + +- Add baselibs.conf to sources list + +------------------------------------------------------------------- +Wed Sep 10 10:26:02 UTC 2014 - varkoly@suse.com + +- Do not bypass output of useradd and groupadd + ------------------------------------------------------------------- Wed Sep 3 01:49:12 CEST 2014 - ro@suse.de diff --git a/openldap2-client.spec b/openldap2-client.spec index 7870cf3..5a65e97 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -69,6 +69,7 @@ Source4: sasl-slapd.conf Source5: README.update Source6: README.dynamic-overlays Source7: schema2ldif +Source8: baselibs.conf Source100: openldap-2.3.37.tgz Patch1: 0001-build-adjustments.dif Patch2: 0002-slapd.conf.dif @@ -541,9 +542,8 @@ cat openldap2.filelist openldap2-back-perl.filelist \ %if "%{name}" == "openldap2" %pre -/usr/sbin/groupadd -g 70 -o -r ldap 2> /dev/null || : -/usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/bash -c "User for OpenLDAP" -d \ - /var/lib/ldap ldap 2> /dev/null || : +/usr/sbin/groupadd -g 70 -o -r ldap || : +/usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/bash -c "User for OpenLDAP" -d /var/lib/ldap ldap || : # try to figure out if a db update is needed if [ ${1:-0} -gt 1 ] && [ -f /usr/lib/openldap/slapd ] && /usr/bin/strings /usr/lib/openldap/slapd | \ diff --git a/openldap2.changes b/openldap2.changes index 98cb202..c4005e1 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -3,6 +3,11 @@ Mon Sep 22 13:41:56 UTC 2014 - tchvatal@suse.com - Add baselibs.conf to sources list +------------------------------------------------------------------- +Wed Sep 10 10:26:02 UTC 2014 - varkoly@suse.com + +- Do not bypass output of useradd and groupadd + ------------------------------------------------------------------- Wed Sep 3 01:49:12 CEST 2014 - ro@suse.de diff --git a/openldap2.spec b/openldap2.spec index 6ec0d6c..3647177 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -542,9 +542,8 @@ cat openldap2.filelist openldap2-back-perl.filelist \ %if "%{name}" == "openldap2" %pre -/usr/sbin/groupadd -g 70 -o -r ldap 2> /dev/null || : -/usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/bash -c "User for OpenLDAP" -d \ - /var/lib/ldap ldap 2> /dev/null || : +/usr/sbin/groupadd -g 70 -o -r ldap || : +/usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/bash -c "User for OpenLDAP" -d /var/lib/ldap ldap || : # try to figure out if a db update is needed if [ ${1:-0} -gt 1 ] && [ -f /usr/lib/openldap/slapd ] && /usr/bin/strings /usr/lib/openldap/slapd | \