abrooks/cockpit
SHA256
1
0
Fork 0
forked from cockpit/cockpit
Code Pull Requests Activity

Accepting request 1108266 from home:malikirri:branches:systemsmanagement:cockpit

Browse Source 
- Fix building for SLE15.5 and SLE15.4

OBS-URL: https://build.opensuse.org/request/show/1108266
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=141
This commit is contained in:
Adam Majer 2023-08-31 11:18:45 +00:00 committed by Git OBS Bridge
parent 28bdb341f0
commit 91c8aa46a4
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_service
View File

@ -7,6 +7,9 @@
</service> </service>
<service mode="buildtime" name="tar"> <service mode="buildtime" name="tar">
<param name="obsinfo">cockpit-suse-theme.obsinfo</param> <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>
<service name="obs_scm" mode="manual"> <service name="obs_scm" mode="manual">
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>

5
cockpit.changes
View File

@ -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> Fri Aug 18 13:15:17 UTC 2023 - Adam Majer <adam.majer@suse.de>

7
cockpit.spec
View File

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