Accepting request 1108267 from systemsmanagement:cockpit

OBS-URL: https://build.opensuse.org/request/show/1108267
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cockpit?expand=0&rev=34

_service

@@ -7,6 +7,9 @@
   </service>
   <service mode="buildtime" name="tar">
     <param name="obsinfo">cockpit-suse-theme.obsinfo</param>
+    <!-- On SLE15.4 extra '-' gets added to the filename so we need to
+         define the name explicitly -->
+    <param name="filename">cockpit-suse-theme</param>
   </service>
   <service name="obs_scm" mode="manual">
     <param name="versionformat">@PARENT_TAG@</param>

cockpit.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 31 10:00:06 UTC 2023 - Miika Alikirri <miika.alikirri@suse.com>
+
+- Fix building for SLE15.5 and SLE15.4
+
 -------------------------------------------------------------------
 Fri Aug 18 13:15:17 UTC 2023 - Adam Majer <adam.majer@suse.de>
 

cockpit.spec

@@ -130,11 +130,16 @@ BuildRequires: pam-devel
 BuildRequires: autoconf automake
 BuildRequires: make
 BuildRequires: /usr/bin/python3
-%if 0%{?rhel} && 0%{?rhel} <= 8
+%if ( 0%{?rhel} && 0%{?rhel} <= 8 ) || 0%{?suse_version} <= 1500
 # RHEL 8's gettext does not yet have metainfo.its
 BuildRequires: gettext >= 0.19.7
+%if 0%{?rhel}
 BuildRequires: libappstream-glib-devel
 %else
+# Suse's package has a different name
+BuildRequires: appstream-glib-devel
+%endif
+%else
 BuildRequires: gettext >= 0.21
 %endif
 %if 0%{?build_basic}