- Remove legacy daemon control that was used to migrate from SLE 11

to 12. (bsc#1038405)

OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=178
This commit is contained in:
Howard Guo 2017-06-07 09:33:31 +00:00 committed by Git OBS Bridge
parent 3f601cf55f
commit 39fedbb334
2 changed files with 6 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 7 09:32:52 UTC 2017 - hguo@suse.com
- Remove legacy daemon control that was used to migrate from SLE 11
to 12. (bsc#1038405)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 6 13:47:18 UTC 2017 - hguo@suse.com Tue Jun 6 13:47:18 UTC 2017 - hguo@suse.com

View File

@ -431,9 +431,6 @@ ln -s libldap_r-2.4.so.2 "%{buildroot}/%{_libdir}/libldap-2.4.so.2"
%pre %pre
getent group ldap >/dev/null || /usr/sbin/groupadd -g 70 -o -r ldap getent group ldap >/dev/null || /usr/sbin/groupadd -g 70 -o -r ldap
getent passwd ldap >/dev/null || /usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/false -c "User for OpenLDAP" -d /var/lib/ldap ldap getent passwd ldap >/dev/null || /usr/sbin/useradd -r -o -g ldap -u 76 -s /bin/false -c "User for OpenLDAP" -d /var/lib/ldap ldap
if /usr/bin/chkconfig ldap 2>&1 | grep -q on; then
touch %{_rundir}/enable_slapd_service
fi
%service_add_pre slapd.service %service_add_pre slapd.service
%post %post
@ -442,11 +439,7 @@ if [ ${1:-0} -gt 1 ] && [ -f %{_libdir}/sasl2/slapd.conf ] ; then
cp %{_libdir}/sasl2/slapd.conf /etc/sasl2/slapd.conf cp %{_libdir}/sasl2/slapd.conf /etc/sasl2/slapd.conf
fi fi
%{fillup_only -n openldap ldap} %{fillup_only -n openldap ldap}
%{remove_and_set -n openldap OPENLDAP_RUN_DB_RECOVER}
%service_add_post slapd.service %service_add_post slapd.service
if [ -f %{_rundir}/enable_slapd_service ]; then
/usr/bin/systemctl --quiet enable slapd
fi
%post -n libldap-2_4-2 -p /sbin/ldconfig %post -n libldap-2_4-2 -p /sbin/ldconfig