Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2014-02-21 19:43:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openldap2" Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2-client.changes 2014-02-18 14:46:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openldap2.new/openldap2-client.changes 2014-02-21 19:43:33.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 18 14:39:07 UTC 2014 - [email protected] + +- Fix systemd service installation + +------------------------------------------------------------------- openldap2.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.P3fVgs/_old 2014-02-21 19:43:34.000000000 +0100 +++ /var/tmp/diff_new_pack.P3fVgs/_new 2014-02-21 19:43:34.000000000 +0100 @@ -51,10 +51,11 @@ %if 0%{?suse_version} >= 1140 # avoid cycle with krb5 BuildRequires: krb5-mini +BuildRequires: pkgconfig(systemd) +%{?systemd_requires} %endif Conflicts: openldap-client Requires: libldap-2_4-2 = %{version_main} -Requires: systemd %endif Source: openldap-%{version_main}.tgz Source1: openldap-rc.tgz @@ -317,10 +318,10 @@ %install mkdir -p $RPM_BUILD_ROOT/usr/lib/openldap/ mkdir -p $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system +mkdir -p $RPM_BUILD_ROOT/%{_unitdir} make STRIP="" DESTDIR=$RPM_BUILD_ROOT install install -m 755 start $RPM_BUILD_ROOT/usr/lib/openldap/start -install -m 644 slapd.service $RPM_BUILD_ROOT/usr/lib/systemd/system +install -m 644 slapd.service $RPM_BUILD_ROOT/%{_unitdir} mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/slapd.d mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/sasl2/slapd.conf @@ -361,6 +362,13 @@ rm -f $RPM_BUILD_ROOT/etc/openldap/slapd.ldif* rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example mv servers/slapd/back-sql/rdbms_depend servers/slapd/back-sql/examples +# Provide SUSE policy symlink /usr/sbin/rcFOO -> /etc/init.d/FOO +# /usr/sbin/service exists only since openSUSE 12.3: +%if 0%{?suse_version} > 1220 +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcslapd +%else +ln -s /sbin/service %{buildroot}%{_sbindir}/rcslapd +%endif %if %suse_version < 1130 # install 2.3 slapcat install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat @@ -386,6 +394,7 @@ /var/adm/fillup-templates/sysconfig.openldap %config /etc/sysconfig/SuSEfirewall2.d/services/openldap /usr/sbin/slap* +/usr/sbin/rcslapd %dir /etc/sasl2 %dir /etc/openldap %dir %attr(0770, ldap, ldap) /etc/openldap/slapd.d @@ -540,6 +549,7 @@ cp -p --remove-destination /etc/openldap/schema/* $TEMPDIR echo $TEMPDIR > /etc/openldap/UPDATE_NEEDED ; fi +%service_add_pre slapd.service %post if [ ${1:-0} -gt 1 ] && [ -f %{_libdir}/sasl2/slapd.conf ] ; then @@ -548,12 +558,13 @@ fi %{fillup_only -n openldap ldap} %{remove_and_set -n openldap OPENLDAP_RUN_DB_RECOVER} +%service_add_post slapd.service %preun -%stop_on_removal ldap +%service_del_preun slapd.service %postun -%restart_on_update ldap +%service_del_postun slapd.service %post -n compat-libldap-2_3-0 -p /sbin/ldconfig openldap2.spec: same change -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
