Accepting request 1157946 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1157946
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2-branding?expand=0&rev=21

glib2-branding.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 14 10:38:22 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).
+
 -------------------------------------------------------------------
 Wed Apr 19 12:52:08 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
 

glib2-branding.spec

@@ -1,7 +1,7 @@
 #
-# spec file
+# spec file for package glib2-branding
 #
-# Copyright (c) 2023 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,10 +16,10 @@
 #
 
 
-%define flavor @BUILD_FLAVOR@
+%define flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == ""
 %define branding_name %{nil}
-ExclusiveArch:  %{nil}
+ExclusiveArch:  do-not-build
 %else
 %define branding_name %{flavor}
 %define dash -
@@ -30,7 +30,7 @@ ExclusiveArch:  %{nil}
 %endif
 %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
 %endif
 %define gio_real_package %(rpm -q --qf '%%{name}' --whatprovides gio)