From 51e40017f0b7bfb0f837df9168e5420be04d9d29c3bb8c47586e7508d729dc79 Mon Sep 17 00:00:00 2001 From: Peter Varkoly Date: Thu, 24 Apr 2014 08:45:18 +0000 Subject: [PATCH] Accepting request 231204 from home:dirkmueller:branches:network:ldap - move systemd requires to server package OBS-URL: https://build.opensuse.org/request/show/231204 OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=117 --- openldap2-client.spec | 2 +- openldap2.changes | 5 +++++ openldap2.spec | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/openldap2-client.spec b/openldap2-client.spec index 291503c..bc2374f 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -47,13 +47,13 @@ BuildRequires: libdb-4_5-devel Conflicts: openldap Requires: libldap-2_4-2 = %{version_main} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -%else %if 0%{?suse_version} >= 1140 # avoid cycle with krb5 BuildRequires: krb5-mini BuildRequires: pkgconfig(systemd) %{?systemd_requires} %endif +%else Conflicts: openldap-client Requires: libldap-2_4-2 = %{version_main} %endif diff --git a/openldap2.changes b/openldap2.changes index 36850be..f5bda92 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 23 20:51:14 UTC 2014 - dmueller@suse.com + +- move systemd requires to server package + ------------------------------------------------------------------- Tue Feb 18 14:39:07 UTC 2014 - ckornacker@suse.com diff --git a/openldap2.spec b/openldap2.spec index 303e502..863ac51 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -47,13 +47,13 @@ BuildRequires: libdb-4_5-devel Conflicts: openldap Requires: libldap-2_4-2 = %{version_main} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -%else %if 0%{?suse_version} >= 1140 # avoid cycle with krb5 BuildRequires: krb5-mini BuildRequires: pkgconfig(systemd) %{?systemd_requires} %endif +%else Conflicts: openldap-client Requires: libldap-2_4-2 = %{version_main} %endif