From 44bb9e694a612453b7ba30ceb2be9a70d44705fc Mon Sep 17 00:00:00 2001
From: jianli-97 <lijian2@kylinos.cn>
Date: Wed, 3 Jan 2024 23:00:38 +0800
Subject: [PATCH] detach the sub package gnutls-utils and gnutls-dane from
 gnutls

---
 gnutls.spec | 70 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 54 insertions(+), 16 deletions(-)

diff --git a/gnutls.spec b/gnutls.spec
index 78c065f..06e72da 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -1,6 +1,6 @@
 Name: gnutls
 Version: 3.8.0
-Release: 2
+Release: 3
 Summary: The GNU Secure Communication Protocol Library
 
 License: LGPLv2.1+ and GPLv3+
@@ -35,12 +35,8 @@ Requires: crypto-policies, p11-kit-trust, libtasn1, nettle
 Recommends: trousers >= 0.3.11.2
 
 Provides: bundled(gnulib) = 20130424
-Provides: gnutls-utils = %{version}-%{release}
 Provides: gnutls-c++ = %{version}-%{release}
-Provides: gnutls-dane = %{version}-%{release}
-Obsoletes: gnutls-utils < %{version}-%{release} 
-Obsoletes: gnutls-c++ < %{version}-%{release} 
-Obsoletes: gnutls-dane < %{version}-%{release}
+Obsoletes: gnutls-c++ < %{version}-%{release}
 
 %description
 GnuTLS is a secure communications library implementing the SSL, TLS and DTLS
@@ -56,11 +52,45 @@ of application code.
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
+%if %{with dane}
+Requires: %{name}-dane%{?_isa} = %{version}-%{release}
+%endif
 Requires: pkgconf
 
 %description devel
 This package contains files needed for developing applications with %{name}.
 
+%package utils
+License:GPLv3+
+Summary:Command line tools for TLS protocol
+Requires:%{name}%{?_isa} = %{version}-%{release}
+%if %{with dane}
+Requires: %{name}-dane%{?_isa} = %{version}-%{release}
+%endif
+
+%description utils
+GnuTLS is a secure communications library implementing the SSL, TLS and DTLS
+protocols and technologies around them. It provides a simple C language
+application programming interface (API) to access the secure communications
+protocols as well as APIs to parse and write X.509, PKCS #12, and other
+required structures.
+This package contains command line TLS client and servers and certificate manipulation tools.
+
+%if %{with dane}
+%package dane
+Summary: A DANE protocol implementation for GnuTLS
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description dane
+GnuTLS is a secure communications library implementing the SSL, TLS and DTLS 
+protocols and technologies around them. It provides a simple C language 
+application programming interface (API) to access the secure communications 
+protocols as well as APIs to parse and write X.509, PKCS #12, OpenPGP and 
+other required structures. 
+This package contains library that implements the DANE protocol for verifying
+TLS certificates through DNSSEC.
+%endif
+
 %package_help
 
 %if %{with guile}
@@ -157,16 +187,6 @@ make check %{?_smp_mflags}
 %defattr(-,root,root)
 %doc README.md AUTHORS
 %license LICENSE doc/COPYING doc/COPYING.LESSER
-%{_bindir}/certtool
-%{_bindir}/tpmtool
-%{_bindir}/ocsptool
-%{_bindir}/psktool
-%{_bindir}/p11tool
-%{_bindir}/gnutls*
-%if %{with dane}
-%{_bindir}/danetool
-%{_libdir}/libgnutls-dane.so.*
-%endif
 %{_libdir}/libgnutls.so.30*
 %{_libdir}/libgnutlsxx.so.*
 %if %{with fips}
@@ -179,6 +199,21 @@ make check %{?_smp_mflags}
 %{_libdir}/libgnutls*.so
 %{_includedir}/*
 
+%files utils
+%{_bindir}/certtool
+%{_bindir}/tpmtool
+%{_bindir}/ocsptool
+%{_bindir}/psktool
+%{_bindir}/p11tool
+%{_bindir}/gnutls*
+
+%if %{with dane}
+%files dane
+%defattr(-,root,root,-)
+%{_bindir}/danetool
+%{_libdir}/libgnutls-dane.so.*
+%endif
+
 %files help
 %defattr(-,root,root)
 %doc NEWS THANKS doc/certtool.cfg
@@ -199,6 +234,9 @@ make check %{?_smp_mflags}
 %endif
 
 %changelog
+* Thu Jan 04 2024 lijian <lijian2@kylinos.cn> - 3.8.0-3
+- detach the sub package gnutls-utils and gnutls-dane from gnutls
+
 * Mon Nov 20 2023 xuraoqing <xuraoqing@huawei.com> - 3.8.0-2
 - fix CVE-2023-5981
 
-- 
Gitee