From 9f81fd6bf392ee4b04b7772caf6fc7e6b2767af79ced702a82ce0da8c495e52f Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Wed, 17 Oct 2012 07:48:12 +0000 Subject: [PATCH] Accepting request 138418 from openSUSE:Factory:Staging:Systemd - buildrequire systemd by pkgconfig provide to get systemd-mini - revert the -p usage in %postun to fix SLE build - buildrequire systemd by pkgconfig provide to get systemd-mini OBS-URL: https://build.opensuse.org/request/show/138418 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=79 --- krb5-mini.changes | 5 +++++ krb5-mini.spec | 2 +- krb5.changes | 10 ++++++++++ krb5.spec | 8 +++++--- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index 7f1fb2f..7d147d2 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 16 12:05:00 UTC 2012 - coolo@suse.com + +- buildrequire systemd by pkgconfig provide to get systemd-mini + ------------------------------------------------------------------- Sat Oct 13 16:50:59 UTC 2012 - coolo@suse.com diff --git a/krb5-mini.spec b/krb5-mini.spec index c01aa14..55d27a7 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -40,7 +40,7 @@ BuildRequires: libopenssl-devel BuildRequires: openldap2-devel BuildRequires: pam-devel %if 0%{?suse_version} >= 1210 -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) %endif # bug437293 %ifarch ppc64 diff --git a/krb5.changes b/krb5.changes index 7f1fb2f..c9a1734 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Oct 16 19:35:47 UTC 2012 - coolo@suse.com + +- revert the -p usage in %postun to fix SLE build + +------------------------------------------------------------------- +Tue Oct 16 12:05:00 UTC 2012 - coolo@suse.com + +- buildrequire systemd by pkgconfig provide to get systemd-mini + ------------------------------------------------------------------- Sat Oct 13 16:50:59 UTC 2012 - coolo@suse.com diff --git a/krb5.spec b/krb5.spec index af64b6f..c74625d 100644 --- a/krb5.spec +++ b/krb5.spec @@ -40,7 +40,7 @@ BuildRequires: libopenssl-devel BuildRequires: openldap2-devel BuildRequires: pam-devel %if 0%{?suse_version} >= 1210 -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) %endif # bug437293 %ifarch ppc64 @@ -282,7 +282,8 @@ rm -rf %{buildroot}/usr/lib/mit/share %post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig %if ! %{build_mini} @@ -324,7 +325,8 @@ rm -rf %{buildroot}/usr/lib/mit/share %post plugin-kdb-ldap -p /sbin/ldconfig -%postun plugin-kdb-ldap -p /sbin/ldconfig +%postun plugin-kdb-ldap +/sbin/ldconfig %endif