rpms/openldap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

use systemd-rpm macros in spec file

Browse Source 
Resolves: #850247
This commit is contained in:
Jan Vcelak 2013-03-06 23:09:13 +01:00
parent 705b2a5032
commit 51d38be75b
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
openldap.spec
View File

@ -87,9 +87,9 @@ Summary: LDAP server
License: OpenLDAP License: OpenLDAP
Requires: openldap%{?_isa} = %{version}-%{release}, libdb-utils Requires: openldap%{?_isa} = %{version}-%{release}, libdb-utils
Requires(pre): shadow-utils Requires(pre): shadow-utils
Requires(post): systemd-units, systemd-sysv, chkconfig Requires(post): systemd, systemd-sysv, chkconfig
Requires(preun): systemd-units Requires(preun): systemd
Requires(postun): systemd-units Requires(postun): systemd
BuildRequires: libdb-devel BuildRequires: libdb-devel
BuildRequires: systemd-units BuildRequires: systemd-units
Group: System Environment/Daemons Group: System Environment/Daemons
@ -391,11 +391,7 @@ exit 0
%post servers %post servers
/sbin/ldconfig /sbin/ldconfig
%systemd_post slapd.service
if [ $1 -eq 1 ]; then
# initial installation
%{systemctl_bin} daemon-reload &>/dev/null || :
fi
# generate sample TLS certificate for server (will not replace) # generate sample TLS certificate for server (will not replace)
%{_libexecdir}/openldap/generate-server-cert.sh -o &>/dev/null || : %{_libexecdir}/openldap/generate-server-cert.sh -o &>/dev/null || :
@ -460,22 +456,14 @@ fi
exit 0 exit 0
%preun servers %preun servers
if [ $1 -eq 0 ]; then
# package removal %systemd_preun slapd.service
%{systemctl_bin} --no-reload disable slapd.service &>/dev/null || :
%{systemctl_bin} stop slapd.service &>/dev/null || :
fi
%postun servers %postun servers
/sbin/ldconfig /sbin/ldconfig
%systemd_postun_with_restart slapd.service
%{systemctl_bin} daemon-reload &>/dev/null || :
if [ $1 -ge 1 ]; then
# package upgrade
%{systemctl_bin} try-restart slapd.service &>/dev/null || :
fi
exit 0
%post devel -p /sbin/ldconfig %post devel -p /sbin/ldconfig
@ -621,6 +609,7 @@ exit 0
* Wed Mar 06 2013 Jan Vcelak <jvcelak@fedoraproject.org> 2.4.34-1 * Wed Mar 06 2013 Jan Vcelak <jvcelak@fedoraproject.org> 2.4.34-1
- new upstream release (#917603) - new upstream release (#917603)
- fix: slapcat segfaults if cn=config.ldif not present (#872784) - fix: slapcat segfaults if cn=config.ldif not present (#872784)
- use systemd-rpm macros in spec file (#850247)
* Thu Jan 31 2013 Jan Synáček <jsynacek@redhat.com> 2.4.33-4 * Thu Jan 31 2013 Jan Synáček <jsynacek@redhat.com> 2.4.33-4
- rebuild against new cyrus-sasl - rebuild against new cyrus-sasl