Accepting request 593004 from Base:System

OBS-URL: https://build.opensuse.org/request/show/593004
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=110

gnutls.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Mar 29 10:01:31 UTC 2018 - vcizek@suse.com
+
+- Simplify the DANE support %ifdef condition
+  * build with DANE on openSUSE only
+
+-------------------------------------------------------------------
+Mon Mar 26 16:17:55 UTC 2018 - jengelh@inai.de
+
+- Adjust RPM groups. Drop %if..%endif guards that are idempotent.
+
 -------------------------------------------------------------------
 Fri Mar 23 11:20:59 UTC 2018 - vcizek@suse.com
 

gnutls.spec

@@ -20,11 +20,11 @@
 %define gnutlsxx_sover 28
 %define gnutls_dane_sover 0
 
-# unbound isn't in SLE-15 (bsc#1086428)
+# unbound isn't in SLE (bsc#1086428)
-%if 0%{?sle_version} == 150000 && !0%{?is_opensuse}
+%if 0%{?is_opensuse}
-%bcond_with dane
-%else
 %bcond_without dane
+%else
+%bcond_with dane
 %endif
 %bcond_with tpm
 %bcond_without guile
@@ -93,17 +93,15 @@ The GnuTLS library provides a secure layer over a reliable transport
 layer. Currently the GnuTLS library implements the proposed standards
 of the IETF's TLS working group.
 
-%if %{with dane}
 %package -n libgnutls-dane%{gnutls_dane_sover}
-Summary:        The GNU Transport Layer Security Library
+Summary:        DANE support for the GNU Transport Layer Security Library
 License:        LGPL-2.1-or-later
-Group:          Productivity/Networking/Security
+Group:          System/Libraries
 
 %description -n libgnutls-dane%{gnutls_dane_sover}
 The GnuTLS project aims to develop a library that provides a secure
 layer over a reliable transport layer.
 This package contains the "DANE" part of gnutls.
-%endif
 
 %package -n libgnutlsxx%{gnutlsxx_sover}
 Summary:        C++ API for the GNU Transport Layer Security Library
@@ -127,7 +125,6 @@ Provides:       gnutls-devel = %{version}-%{release}
 %description -n libgnutls-devel
 Files needed for software development using gnutls.
 
-%if %{with dane}
 %package -n libgnutls-dane-devel
 Summary:        Development package for GnuTLS DANE component
 License:        LGPL-2.1-or-later
@@ -136,7 +133,6 @@ Requires:       libgnutls-dane%{gnutls_dane_sover} = %{version}
 
 %description -n libgnutls-dane-devel
 Files needed for software development using gnutls.
-%endif
 
 %package -n libgnutlsxx-devel
 Summary:        Development package for the GnuTLS C++ API
@@ -150,7 +146,6 @@ Requires(pre):  %{install_info_prereq}
 %description -n libgnutlsxx-devel
 Files needed for software development using gnutls.
 
-%if %{with guile}
 %package guile
 Summary:        Guile wrappers for gnutls
 License:        LGPL-2.1-or-later
@@ -159,7 +154,6 @@ Requires:       guile
 
 %description guile
 GnuTLS Wrappers for GNU Guile, a dialect of Scheme.
-%endif
 
 %prep
 %setup -q