Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2012-10-16 07:06:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krb5", Maintainer is "mc@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes 2012-10-06 08:19:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-mini.changes 2012-10-16 07:07:01.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Oct 13 16:50:59 UTC 2012 - coolo@suse.com + +- do not require systemd in krb5-mini + +------------------------------------------------------------------- krb5.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.I7qXeO/_old 2012-10-16 07:07:04.000000000 +0200 +++ /var/tmp/diff_new_pack.I7qXeO/_new 2012-10-16 07:07:04.000000000 +0200 @@ -30,9 +30,6 @@ 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 @@ 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 /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 @@ # 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 @@ %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 @@ %{_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 ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.I7qXeO/_old 2012-10-16 07:07:04.000000000 +0200 +++ /var/tmp/diff_new_pack.I7qXeO/_new 2012-10-16 07:07:04.000000000 +0200 @@ -30,9 +30,6 @@ 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 @@ 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 /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 @@ # 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 @@ %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 @@ %{_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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org