!24 Remove the wrong Provides and Obselotes

From: @liquor1
Reviewed-by: @zhujianwei001
Signed-off-by: @zhujianwei001

gnutls.spec

@@ -1,6 +1,6 @@
 Name: gnutls
 Version: 3.6.14
-Release: 3
+Release: 4
 Summary: The GNU Secure Communication Protocol Library
 
 License: LGPLv2.1+ and GPLv3+
@@ -34,8 +34,12 @@ Requires: crypto-policies, p11-kit-trust, libtasn1, nettle
 Recommends: trousers >= 0.3.11.2
 
 Provides: bundled(gnulib) = 20130424
-Provides: gnutls-c++ gnutls-dane
+Provides: gnutls-utils = %{version}-%{release}
-Obsoletes:gnutls-c++ gnutls-dane
+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}
 
 %description
 GnuTLS is a secure communications library implementing the SSL, TLS and DTLS
@@ -56,19 +60,6 @@ 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}
-Provides: gnutls-utils
-Obsoletes:gnutls-utils
-
-%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, OpenPGP and other required structures.
-This package contains command line TLS clinet and server and certificate manipulation tools.
-
 %package_help
 
 %if %{with guile}
@@ -165,7 +156,15 @@ 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}/srptool
+%{_bindir}/gnutls*
 %if %{with dane}
+%{_bindir}/danetool
 %{_libdir}/libgnutls-dane.so.*
 %endif
 %{_libdir}/libgnutls.so.30*
@@ -180,18 +179,6 @@ make check %{?_smp_mflags}
 %{_libdir}/libgnutls*.so
 %{_includedir}/*
 
-%files utils
-%{_bindir}/certtool
-%{_bindir}/tpmtool
-%{_bindir}/ocsptool
-%{_bindir}/psktool
-%{_bindir}/p11tool
-%{_bindir}/srptool
-%{_bindir}/gnutls*
-%if %{with dane}
-%{_bindir}/danetool
-%endif
-
 %files help
 %defattr(-,root,root)
 %doc NEWS THANKS doc/certtool.cfg
@@ -212,6 +199,9 @@ make check %{?_smp_mflags}
 %endif
 
 %changelog
+* Wed Dec 16 2020 liquor <lirui130@huawei.com> - 3.6.14-4
+- revert "Detach the sub package gnutls-utils from gnutls"
+
 * Fri Oct 16 2020 zhangxingliang <zhangxingliang3@huawei.com> - 3.6.14-3
 - Detach the sub package gnutls-utils from gnutls