Accepting request 1157940 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1157940
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/NetworkManager-branding?expand=0&rev=7

NetworkManager-branding.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Mar 14 10:14:55 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Ensure flavor has a value, at least %nil.
+- ExclusiveArch: %nil is invalid: give it a value (do-not-build).
+
+-------------------------------------------------------------------
+Fri Dec  1 16:41:17 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix most rpmlint warnings:
+  + suse-zypp-packageand: use current Supplements: (A and B) syntax
+    over packagand(A:B)
+  + summary-ended-with-dot: Remove dot at the end of Summary:
+  + no-%build-section: Add empty %build section
+  + branding-supplements-missing: Fixes as part of
+    suse-zypp-packageand.
+
 -------------------------------------------------------------------
 Fri Aug 12 06:14:40 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 

NetworkManager-branding.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package NetworkManager-branding
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define flavor @BUILD_FLAVOR@
+%define flavor @BUILD_FLAVOR@%nil
 %if "%{flavor}" == ""
 %define branding_name %{nil}
 ExclusiveArch:  %{nil}
@@ -32,7 +32,7 @@ ExclusiveArch:  %{nil}
 Name:           NetworkManager-branding%{?dash}%{branding_name}
 Version:        42.1
 Release:        0
-Summary:        Default %{branding_name} branding for NetworkManager configuration file.
+Summary:        Default %{branding_name} branding for NetworkManager configuration file
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/System
 URL:            http://www.gnome.org/projects/NetworkManager/
@@ -41,13 +41,13 @@ Source1:        NetworkManager-branding-COPYING
 BuildRequires:  NetworkManager
 BuildRequires:  NetworkManager-branding-upstream
 %requires_eq    NetworkManager
-Supplements:    packageand(NetworkManager:branding-%{branding_name})
+Supplements:    (NetworkManager and branding-%{branding_name})
 Conflicts:      NetworkManager-branding
 Provides:       NetworkManager-branding = %{version}
 BuildArch:      noarch
 %if (0%{?build_SLE} && 0%{?is_opensuse}) || (0%{?build_openSUSE} && ! 0%{?is_opensuse})
 # Don't build SLE branding on openSUSE and vice-versa
-ExclusiveArch:  %{nil}
+ExclusiveArch:  do-not-build
 %endif
 
 %description
@@ -66,6 +66,8 @@ check connectivity against http://conncheck.opensuse.org.
 %setup -q -T -c %{name}-%{version}
 cp %{SOURCE1} COPYING
 
+%build
+
 %install
 install -m0644 -D %{SOURCE0} %{buildroot}%{_prefix}/lib/NetworkManager/conf.d/conncheck-%{branding_name}.conf