SHA256
1
0
forked from pool/krb5

Accepting request 138198 from network

(forwarded request 138156 from coolo)

OBS-URL: https://build.opensuse.org/request/show/138198
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krb5?expand=0&rev=84
This commit is contained in:
Stephan Kulow 2012-10-16 05:06:59 +00:00 committed by Git OBS Bridge
commit c59a42d57b
4 changed files with 32 additions and 92 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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