From df32a9b4a92920cdbff5950c37e676498ae8387d9bcc7c28d0726c78e1889a01 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 15 Oct 2012 13:04:28 +0000 Subject: [PATCH] Accepting request 138156 from openSUSE:Factory:Staging:Systemd OBS-URL: https://build.opensuse.org/request/show/138156 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=77 --- krb5-mini.changes | 5 +++++ krb5-mini.spec | 57 +++++++++-------------------------------------- krb5.changes | 5 +++++ krb5.spec | 57 +++++++++-------------------------------------- 4 files changed, 32 insertions(+), 92 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index 0525ee9..7f1fb2f 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 13 16:50:59 UTC 2012 - coolo@suse.com + +- do not require systemd in krb5-mini + ------------------------------------------------------------------- Fri Oct 5 15:50:38 CEST 2012 - mc@suse.de diff --git a/krb5-mini.spec b/krb5-mini.spec index 3470c16..c01aa14 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -30,9 +30,6 @@ BuildRequires: keyutils-devel BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%endif Version: 1.10.2 Release: 0 Summary: MIT Kerberos5 Implementation--Libraries @@ -42,6 +39,9 @@ Group: Productivity/Networking/Security BuildRequires: libopenssl-devel BuildRequires: openldap2-devel BuildRequires: pam-devel +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif # bug437293 %ifarch ppc64 Obsoletes: krb5-64bit @@ -275,43 +275,16 @@ rm -f %{buildroot}/usr/share/man/man1/tmac.doc* rm -f /usr/share/man/man1/tmac.doc* rm -rf /usr/lib/mit/share rm -rf %{buildroot}/usr/lib/mit/share + ##################################################### -# krb5-mini-devel pre/post/postun -##################################################### -%if %{build_mini} - -%preun -%if 0%{?suse_version} >= 1210 -%service_del_preun krb5kdc.service kadmind.service kpropd.service -%else -%stop_on_removal krb5kdc kadmind kpropd -%endif - -%postun -/sbin/ldconfig -%if 0%{?suse_version} >= 1210 -%service_del_postun krb5kdc.service kadmind.service kpropd.service -%else -%restart_on_update krb5kdc kadmind kpropd -%{insserv_cleanup} -%endif - -%post -/sbin/ldconfig -%if 0%{?suse_version} >= 1210 -%service_add_post krb5kdc.service kadmind.service kpropd.service -%endif - -%else -##################################################### -# krb5 pre/post/postun +# krb5(-mini) pre/post/postun ##################################################### -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig + +%if ! %{build_mini} ##################################################### # krb5-server preun/postun/pre/post @@ -349,11 +322,9 @@ rm -rf %{buildroot}/usr/lib/mit/share # krb5-plugin-kdb-ldap post/postun ##################################################### -%post plugin-kdb-ldap -/sbin/ldconfig +%post plugin-kdb-ldap -p /sbin/ldconfig -%postun plugin-kdb-ldap -/sbin/ldconfig +%postun plugin-kdb-ldap -p /sbin/ldconfig %endif @@ -412,9 +383,6 @@ rm -rf %{buildroot}/usr/lib/mit/share %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %{_var}/adm/fillup-templates/sysconfig.* %{_sysconfdir}/init.d/* -%if 0%{?suse_version} >= 1210 -%{_unitdir}/*.service -%endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* %{_libdir}/libk5crypto.so.* @@ -426,9 +394,6 @@ rm -rf %{buildroot}/usr/lib/mit/share %{_libdir}/libverto.so.* %{_libdir}/libverto-k5ev.so.* %{_libdir}/krb5/plugins/kdb/* -%if ! 0%{?build_mini} -%{_libdir}/krb5/plugins/preauth/* -%endif #/usr/lib/mit/sbin/* /usr/lib/mit/sbin/kadmin.local /usr/lib/mit/sbin/kadmind diff --git a/krb5.changes b/krb5.changes index 0525ee9..7f1fb2f 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Oct 13 16:50:59 UTC 2012 - coolo@suse.com + +- do not require systemd in krb5-mini + ------------------------------------------------------------------- Fri Oct 5 15:50:38 CEST 2012 - mc@suse.de diff --git a/krb5.spec b/krb5.spec index 60405de..af64b6f 100644 --- a/krb5.spec +++ b/krb5.spec @@ -30,9 +30,6 @@ BuildRequires: keyutils-devel BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel -%if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%endif Version: 1.10.2 Release: 0 Summary: MIT Kerberos5 Implementation--Libraries @@ -42,6 +39,9 @@ Group: Productivity/Networking/Security BuildRequires: libopenssl-devel BuildRequires: openldap2-devel BuildRequires: pam-devel +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif # bug437293 %ifarch ppc64 Obsoletes: krb5-64bit @@ -275,43 +275,16 @@ rm -f %{buildroot}/usr/share/man/man1/tmac.doc* rm -f /usr/share/man/man1/tmac.doc* rm -rf /usr/lib/mit/share rm -rf %{buildroot}/usr/lib/mit/share + ##################################################### -# krb5-mini-devel pre/post/postun -##################################################### -%if %{build_mini} - -%preun -%if 0%{?suse_version} >= 1210 -%service_del_preun krb5kdc.service kadmind.service kpropd.service -%else -%stop_on_removal krb5kdc kadmind kpropd -%endif - -%postun -/sbin/ldconfig -%if 0%{?suse_version} >= 1210 -%service_del_postun krb5kdc.service kadmind.service kpropd.service -%else -%restart_on_update krb5kdc kadmind kpropd -%{insserv_cleanup} -%endif - -%post -/sbin/ldconfig -%if 0%{?suse_version} >= 1210 -%service_add_post krb5kdc.service kadmind.service kpropd.service -%endif - -%else -##################################################### -# krb5 pre/post/postun +# krb5(-mini) pre/post/postun ##################################################### -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig + +%if ! %{build_mini} ##################################################### # krb5-server preun/postun/pre/post @@ -349,11 +322,9 @@ rm -rf %{buildroot}/usr/lib/mit/share # krb5-plugin-kdb-ldap post/postun ##################################################### -%post plugin-kdb-ldap -/sbin/ldconfig +%post plugin-kdb-ldap -p /sbin/ldconfig -%postun plugin-kdb-ldap -/sbin/ldconfig +%postun plugin-kdb-ldap -p /sbin/ldconfig %endif @@ -412,9 +383,6 @@ rm -rf %{buildroot}/usr/lib/mit/share %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %{_var}/adm/fillup-templates/sysconfig.* %{_sysconfdir}/init.d/* -%if 0%{?suse_version} >= 1210 -%{_unitdir}/*.service -%endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* %{_libdir}/libk5crypto.so.* @@ -426,9 +394,6 @@ rm -rf %{buildroot}/usr/lib/mit/share %{_libdir}/libverto.so.* %{_libdir}/libverto-k5ev.so.* %{_libdir}/krb5/plugins/kdb/* -%if ! 0%{?build_mini} -%{_libdir}/krb5/plugins/preauth/* -%endif #/usr/lib/mit/sbin/* /usr/lib/mit/sbin/kadmin.local /usr/lib/mit/sbin/kadmind