From 1dca8a9b909d53bbc64951131a3b020aa961e0ba Mon Sep 17 00:00:00 2001
From: guoxiaoqi <guoxiaoqi2@huawei.com>
Date: Mon, 17 Feb 2020 11:07:59 +0800
Subject: [PATCH] add krb5-libs containing some commands and dynamic library

---
 krb5.spec | 50 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/krb5.spec b/krb5.spec
index 19fb5ec..6c24647 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -2,7 +2,7 @@
 
 Name:     krb5
 Version:  1.17
-Release:  8
+Release:  9
 Summary:  The Kerberos network authentication protocol
 License:  MIT
 URL:      http://web.mit.edu/kerberos/www/
@@ -32,9 +32,8 @@ BuildRequires: perl-interpreter dejagnu python3 tcl-devel
 BuildRequires: net-tools rpcbind hostname iproute libverto-devel
 BuildRequires: nss_wrapper socket_wrapper keyutils, keyutils-libs-devel
 
-Requires:      coreutils gawk grep sed keyutils
-Obsoletes:     libkadm5 krb5-libs
-Provides:      libkadm5 krb5-libs
+Obsoletes:     libkadm5 < %{version}-%{release}
+Provides:      libkadm5 = %{version}-%{release}
 
 %description
 Kerberos is a network authentication protocol.
@@ -45,10 +44,12 @@ cryptography.
 
 %package server
 Summary:    krb5 server
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:   logrotate libverto systemd words crypto-policies
-Obsoletes:  krb5-pkinit krb5-server-ldap
-Provides:   krb5-pkinit krb5-server-ldap
+Obsoletes:  krb5-pkinit < %{version}-%{release}
+Obsoletes:  krb5-server-ldap < %{version}-%{release}
+Provides:   krb5-pkinit = %{version}-%{release}
+Provides:   krb5-server-ldap = %{version}-%{release}
 Obsoletes:  krb5-pkinit-openssl < %{version}-%{release}
 Provides:   krb5-pkinit-openssl = %{version}-%{release}
 
@@ -57,7 +58,7 @@ This package provides krb5 server programs.
 
 %package client
 Summary:    krb5 client
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-libs%{?_isa} = %{version}-%{release}
 Obsoletes:  %{name}-workstation
 Provides:   %{name}-workstation
 
@@ -66,13 +67,21 @@ This package provides krb5 client programs.
 
 %package devel
 Summary:    Development files for compiling with krb5
-Requires:   %{name} = %{version}-%{release}
+Requires:   %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:   e2fsprogs-devel keyutils-libs-devel libselinux-devel libverto-devel
 Provides:   krb5-kdb-version = 7.0
 
 %description devel
 %{summary}.
 
+%package libs
+Summary:    The non-admin shared libraries used by Kerberos 5
+Requires:   coreutils gawk grep sed keyutils-libs
+Requires:   /etc/crypto-policies/back-ends/krb5.config
+
+%description libs
+This package contains the shared libraries needed by Kerberos 5.
+
 %package help
 Summary:    The documents for krb5
 BuildArch:  noarch
@@ -179,9 +188,14 @@ make -C src check || :
 %postun server
 %systemd_postun_with_restart krb5kdc.service kadmin.service kprop.service
 
-%files -f mit-krb5.lang
+%files
 %defattr(-,root,root,-)
 %doc NOTICE README
+%{_libdir}/libkadm5clnt_mit.so.*
+%{_libdir}/libkadm5srv_mit.so.*
+
+%files libs -f mit-krb5.lang
+%defattr(-,root,root,-)
 %dir /etc/gss
 %dir /etc/gss/mech.d
 %dir /etc/krb5.conf.d
@@ -194,8 +208,14 @@ make -C src check || :
 %{_libdir}/libkrad.so.*
 %{_libdir}/libkrb5.so.*
 %{_libdir}/libkrb5support.so.*
-%{_libdir}/libkadm5clnt_mit.so.*
-%{_libdir}/libkadm5srv_mit.so.*
+%dir %{_libdir}/krb5
+%dir %{_libdir}/krb5/plugins
+%dir %{_libdir}/krb5/plugins/*
+%{_libdir}/krb5/plugins/preauth/spake.so
+%{_libdir}/krb5/plugins/tls/k5tls.so
+%dir %{_var}/kerberos
+%dir %{_var}/kerberos/krb5
+%dir %{_var}/kerberos/krb5/user
 
 %files server
 %defattr(-,root,root,-)
@@ -214,13 +234,10 @@ make -C src check || :
 %dir %{_libdir}/krb5/plugins/kdb
 %dir %{_libdir}/krb5/plugins/preauth
 %dir %{_libdir}/krb5/plugins/authdata
-%dir %{_libdir}/krb5/plugins/tls
 %{_libdir}/krb5/plugins/preauth/otp.so
 %{_libdir}/krb5/plugins/preauth/pkinit.so
-%{_libdir}/krb5/plugins/preauth/spake.so
 %{_libdir}/krb5/plugins/kdb/db2.so
 %{_libdir}/krb5/plugins/kdb/kldap.so
-%{_libdir}/krb5/plugins/tls/k5tls.so
 %{_libdir}/libkdb_ldap.so
 %{_libdir}/libkdb_ldap.so.*
 %{_sbindir}/kdb5_ldap_util
@@ -274,6 +291,9 @@ make -C src check || :
 %{_mandir}/man8/*
 
 %changelog
+* Mon Feb 17 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.17-9
+- add krb5-libs containing some commands and dynamic library
+
 * Fri Feb 14 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.17-8
 - fix several problems of version 1.17
 
-- 
Gitee