Accepting request 405706 from home:fcrozat:branches:network

- Do no use systemd_requires macros in main package, it adds
  unneeded dependencies which pulls systemd into minimal chroot.
- Only call %insserv_prereq when building for pre-systemd
  distributions.
- Optimise some %post/%postun when only /sbin/ldconfig is called.

OBS-URL: https://build.opensuse.org/request/show/405706
OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=169

krb5.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jun 30 13:34:29 UTC 2016 - fcrozat@suse.com
+
+- Do no use systemd_requires macros in main package, it adds
+  unneeded dependencies which pulls systemd into minimal chroot.
+- Only call %insserv_prereq when building for pre-systemd
+  distributions.
+- Optimise some %post/%postun when only /sbin/ldconfig is called.
+
 ------------------------------------------------------------------
 Tue May 10 12:41:14 UTC 2016 - hguo@suse.com
 

krb5.spec

@@ -41,7 +41,6 @@ BuildRequires:  python-Sphinx
 BuildRequires:  python-libxml2
 BuildRequires:  python-lxml
 BuildRequires:  pkgconfig(systemd)
-%{?systemd_requires}
 # bug437293
 %ifarch ppc64
 Obsoletes:      krb5-64bit
@@ -91,8 +90,12 @@ Requires:       cron
 Requires:       libverto-libev1
 Requires:       logrotate
 Requires:       perl-Date-Calc
+%if 0%{?suse_version} >= 1210
 %{?systemd_requires}
-PreReq:         %insserv_prereq %fillup_prereq
+%else
+PreReq:         %insserv_prereq
+%endif
+PreReq:         %fillup_prereq
 
 %description server
 Kerberos V5 is a trusted-third-party network authentication system,
@@ -324,8 +327,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 
 %post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 #####################################################
 # krb5-server preun/postun/pre/post
@@ -352,8 +354,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 
 %post plugin-kdb-ldap -p /sbin/ldconfig
 
-%postun plugin-kdb-ldap
-/sbin/ldconfig
+%postun plugin-kdb-ldap -p /sbin/ldconfig
 
 ########################################################
 # files sections