- Add fake openSUSE branding target when building on non-openSUSE

builds so branding does not need to be removed

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=125

cockpit.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 13 12:39:20 UTC 2023 - Adam Majer <adam.majer@suse.de>
+
+- Add fake openSUSE branding target when building on non-openSUSE
+  builds so branding does not need to be removed
+
 -------------------------------------------------------------------
 Fri Jun  2 13:26:45 UTC 2023 - Adam Majer <adam.majer@suse.de>
 

cockpit.spec

@@ -1,32 +1,22 @@
 #
+# spec file for package cockpit
+#
+# Copyright (c) 2023 SUSE LLC
 # Copyright (C) 2014-2020 Red Hat, Inc.
 #
-# Cockpit is free software; you can redistribute it and/or modify it
+# All modifications and additions to the file contributed by third parties
-# under the terms of the GNU Lesser General Public License as published by
+# remain the property of their copyright owners, unless otherwise agreed
-# the Free Software Foundation; either version 2.1 of the License, or
+# upon. The license for this file, and modifications and additions to the
-# (at your option) any later version.
+# file, is the same license as for the pristine package itself (unless the
-#
+# license for the pristine package is not an Open Source License, in which
-# Cockpit is distributed in the hope that it will be useful, but
+# case the license is the MIT License). An "Open Source License" is a
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+# license that conforms to the Open Source Definition (Version 1.9)
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# published by the Open Source Initiative.
-# Lesser General Public License for more details.
+
-#
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
-# You should have received a copy of the GNU Lesser General Public License
-# along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
 #
 
-#
-# This file is maintained at the following location:
-# https://github.com/cockpit-project/cockpit/blob/main/tools/cockpit.spec
-#
-# If you are editing this file in another location, changes will likely
-# be clobbered the next time an automated release is done.
-#
-# Check first cockpit-devel@lists.fedorahosted.org
-#
 
-# earliest base that the subpackages work on; this is still required as long as
-# we maintain the basic/optional split, then it can be replaced with just %{version}.
 %define required_base 266
 
 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
@@ -111,14 +101,15 @@ Patch102:       0002-selinux-temporary-remove-setroubleshoot-section.patch
 %endif
 
 BuildRequires:  gcc
+BuildRequires:  pam-devel
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(polkit-agent-1) >= 0.105
-BuildRequires: pam-devel
 
-BuildRequires: autoconf automake
-BuildRequires: make
 BuildRequires:  /usr/bin/python3
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  make
 %if 0%{?rhel} && 0%{?rhel} <= 8
 # RHEL 8's gettext does not yet have metainfo.its
 BuildRequires:  gettext >= 0.19.7
@@ -129,35 +120,35 @@ BuildRequires: gettext >= 0.21
 %if 0%{?build_basic}
 BuildRequires:  libssh-devel >= 0.8.5
 %endif
-BuildRequires: openssl-devel
+BuildRequires:  glib-networking
 BuildRequires:  gnutls-devel >= 3.4.3
+BuildRequires:  libxslt-devel
+BuildRequires:  openssl-devel
+BuildRequires:  sed
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(krb5) >= 1.11
-BuildRequires: libxslt-devel
-BuildRequires: glib-networking
-BuildRequires: sed
 
 BuildRequires:  glib2-devel >= 2.50.0
 # this is for runtimedir in the tls proxy ace21c8879
 BuildRequires:  pkgconfig(libsystemd) >= 235
 %if 0%{?suse_version}
+BuildRequires:  distribution-logos
 BuildRequires:  distribution-release
 BuildRequires:  libpcp-devel
-BuildRequires: pcp-devel
 BuildRequires:  libpcp3
 BuildRequires:  libpcp_import1
 BuildRequires:  openssh
-BuildRequires: distribution-logos
+BuildRequires:  pcp-devel
 BuildRequires:  wallpaper-branding
 # needed for /var/lib/pcp directory ownership
 BuildRequires:  pcp
 %else
-BuildRequires: pcp-libs-devel
-BuildRequires: openssh-clients
 BuildRequires:  docbook-style-xsl
+BuildRequires:  openssh-clients
+BuildRequires:  pcp-libs-devel
 %endif
-BuildRequires: krb5-server
 BuildRequires:  gdb
+BuildRequires:  krb5-server
 
 # For documentation
 BuildRequires:  xmlto
@@ -168,15 +159,15 @@ BuildRequires:  selinux-policy-devel
 
 # for rebuilding nodejs bits
 BuildRequires:  npm
-BuildRequires: sassc
 BuildRequires:  local-npm-registry
+BuildRequires:  sassc
 
 # This is the "cockpit" metapackage. It should only
 # Require, Suggest or Recommend other cockpit-xxx subpackages
 
 Requires:       cockpit-bridge
-Requires: cockpit-ws
 Requires:       cockpit-system
+Requires:       cockpit-ws
 
 # Optional components
 Recommends:     (cockpit-storaged if udisks2)
@@ -397,6 +388,7 @@ ls --hide={default,kubernetes,opensuse,registry,sle-micro,suse} | xargs rm -rv
 popd
 # need this in SUSE as post build checks dislike stale symlinks
 install -m 644 -D /dev/null %{buildroot}/run/cockpit/motd
+install -m 644 -D /dev/null %{buildroot}/usr/share/cockpit/branding/opensuse/default-1920x1200.jpg ||:
 # remove files of not installable packages
 rm -r %{buildroot}%{_datadir}/cockpit/sosreport
 rm -f %{buildroot}/%{_prefix}/share/metainfo/org.cockpit-project.cockpit-sosreport.metainfo.xml
@@ -444,18 +436,17 @@ troubleshooting, interactive command-line sessions, and more.
 %{_datadir}/pixmaps/cockpit.png
 %doc %{_mandir}/man1/cockpit.1.gz
 
-
 %package bridge
 Summary:        Cockpit bridge server-side component
 Requires:       glib-networking
 Provides:       cockpit-ssh = %{version}-%{release}
 # 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
 Conflicts:      cockpit-dashboard < 233
+Conflicts:      cockpit-docker < 233
 Conflicts:      cockpit-networkmanager < 233
 Conflicts:      cockpit-storaged < 233
 Conflicts:      cockpit-system < 233
 Conflicts:      cockpit-tests < 233
-Conflicts: cockpit-docker < 233
 
 %description bridge
 The Cockpit bridge component installed server side and runs commands on the
@@ -530,8 +521,8 @@ This package contains the Cockpit shell and system configuration interfaces.
 %package ws
 Summary:        Cockpit Web Service
 Requires:       glib-networking
-Requires: openssl
 Requires:       glib2 >= 2.50.0
+Requires:       openssl
 Requires:       (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype})
 Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
 Conflicts:      firewalld < 0.6.0-1
@@ -723,9 +714,9 @@ sosreport tool.
 
 %package networkmanager
 Summary:        Cockpit user interface for networking, using NetworkManager
+Requires:       NetworkManager >= 1.6
 Requires:       cockpit-bridge >= %{required_base}
 Requires:       cockpit-shell >= %{required_base}
-Requires: NetworkManager >= 1.6
 Conflicts:      cockpit-wicked
 # Optional components
 Recommends:     NetworkManager-team
@@ -778,18 +769,18 @@ Dummy package from building optional packages only; never install or publish me.
 
 %package -n cockpit-storaged
 Summary:        Cockpit user interface for storage, using udisks
+Requires:       %{__python3}
 Requires:       cockpit-shell >= %{required_base}
 Requires:       udisks2 >= 2.9
-Requires: %{__python3}
 %if 0%{?suse_version}
 Requires:       libudisks2-0_lvm2 >= 2.9
 Recommends:     multipath-tools
 Requires:       python3-dbus-python
 %else
-Recommends: udisks2-lvm2 >= 2.9
-Recommends: udisks2-iscsi >= 2.9
-Recommends: device-mapper-multipath
 Recommends:     clevis-luks
+Recommends:     device-mapper-multipath
+Recommends:     udisks2-iscsi >= 2.9
+Recommends:     udisks2-lvm2 >= 2.9
 Requires:       python3-dbus
 %endif
 BuildArch:      noarch
@@ -844,8 +835,8 @@ systemctl reload-or-try-restart pmlogger
 %package -n cockpit-packagekit
 Summary:        Cockpit user interface for packages
 BuildArch:      noarch
-Requires: cockpit-bridge >= %{required_base}
 Requires:       PackageKit
+Requires:       cockpit-bridge >= %{required_base}
 Recommends:     python3-tracer
 # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468
 Requires:       polkit
@@ -859,5 +850,4 @@ via PackageKit.
 #/ build optional extension packages
 %endif
 
-# The changelog is automatically generated and merged
 %changelog