Fix spec-clean'ed spec file by reverting back to git version

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

cockpit.spec

@@ -1,22 +1,32 @@
 #
-# spec file for package cockpit
-#
-# Copyright (c) 2022 SUSE LLC
 # Copyright (C) 2014-2020 Red Hat, Inc.
 #
-# All modifications and additions to the file contributed by third parties
+# Cockpit is free software; you can redistribute it and/or modify it
-# remain the property of their copyright owners, unless otherwise agreed
+# under the terms of the GNU Lesser General Public License as published by
-# upon. The license for this file, and modifications and additions to the
+# the Free Software Foundation; either version 2.1 of the License, or
-# file, is the same license as for the pristine package itself (unless the
+# (at your option) any later version.
-# license for the pristine package is not an Open Source License, in which
+#
-# case the license is the MIT License). An "Open Source License" is a
+# Cockpit is distributed in the hope that it will be useful, but
-# license that conforms to the Open Source Definition (Version 1.9)
+# WITHOUT ANY WARRANTY; without even the implied warranty of
-# published by the Open Source Initiative.
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-
+# 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; the instances of this get computed/updated
+# by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
 %define required_base 122
 
 # we generally want CentOS packages to be like RHEL; special cases need to check %{centos} explicitly
@@ -52,7 +62,6 @@ Source97:       node_modules.spec.inc
 Patch1:         0001-selinux-allow-login-to-read-motd-file.patch
 Patch2:         hide-docs.patch
 Patch3:         suse-microos-branding.patch
-Patch4:         css-overrides.patch
 # SLE Micro specific patches
 Patch100:       remove-pwscore.patch
 Patch101:       hide-pcp.patch
@@ -87,15 +96,14 @@ Patch101:       hide-pcp.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:  /usr/bin/python3
+BuildRequires: autoconf automake
-BuildRequires:  autoconf
-BuildRequires:  automake
 BuildRequires: make
+BuildRequires: /usr/bin/python3
 %if 0%{?rhel} && 0%{?rhel} <= 8
 # RHEL 8's gettext does not yet have metainfo.its
 BuildRequires: gettext >= 0.19.7
@@ -106,35 +114,35 @@ BuildRequires:  gettext >= 0.21
 %if 0%{?build_basic}
 BuildRequires: libssh-devel >= 0.8.5
 %endif
-BuildRequires:  glib-networking
-BuildRequires:  gnutls-devel >= 3.4.3
-BuildRequires:  libxslt-devel
 BuildRequires: openssl-devel
-BuildRequires:  sed
+BuildRequires: gnutls-devel >= 3.4.3
 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:  pcp-devel
+BuildRequires: distribution-logos
 BuildRequires: wallpaper-branding
 # needed for /var/lib/pcp directory ownership
 BuildRequires: pcp
 %else
-BuildRequires:  docbook-style-xsl
-BuildRequires:  openssh-clients
 BuildRequires: pcp-libs-devel
+BuildRequires: openssh-clients
+BuildRequires: docbook-style-xsl
 %endif
-BuildRequires:  gdb
 BuildRequires: krb5-server
+BuildRequires: gdb
 
 # For documentation
 BuildRequires: xmlto
@@ -145,15 +153,15 @@ BuildRequires:  selinux-policy-devel
 
 # for rebuilding nodejs bits
 BuildRequires: npm
-BuildRequires:  local-npm-registry
 BuildRequires: sassc
+BuildRequires: local-npm-registry
 
 # This is the "cockpit" metapackage. It should only
 # Require, Suggest or Recommend other cockpit-xxx subpackages
 
 Requires: cockpit-bridge
-Requires:       cockpit-system
 Requires: cockpit-ws
+Requires: cockpit-system
 
 # Optional components
 Recommends: (cockpit-storaged if udisks2)
@@ -278,7 +286,6 @@ find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list
 
 echo '%dir %{_datadir}/cockpit/static' > static.list
 echo '%dir %{_datadir}/cockpit/static/fonts' >> static.list
-cp pkg/static/css-overrides.css %{buildroot}%{_datadir}/cockpit/static/
 find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
 
 # when not building basic packages, remove their files
@@ -374,6 +381,7 @@ 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
@@ -382,11 +390,11 @@ Provides:       cockpit-ssh = %{version}-%{release}
 Conflicts: cockpit-ws < 181.x
 # 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
@@ -457,8 +465,8 @@ This package contains the Cockpit shell and system configuration interfaces.
 %package ws
 Summary: Cockpit Web Service
 Requires: glib-networking
-Requires:       glib2 >= 2.50.0
 Requires: openssl
+Requires: glib2 >= 2.50.0
 Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype})
 Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
 Conflicts: firewalld < 0.6.0-1
@@ -625,9 +633,9 @@ sosreport tool.
 
 %package networkmanager
 Summary: Cockpit user interface for networking, using NetworkManager
-Requires:       NetworkManager >= 1.6
 Requires: cockpit-bridge >= 186
 Requires: cockpit-shell >= 186
+Requires: NetworkManager >= 1.6
 # Optional components
 Recommends: NetworkManager-team
 BuildArch: noarch
@@ -676,10 +684,10 @@ Dummy package from building optional packages only; never install or publish me.
 Summary: Cockpit user interface for storage, using udisks
 Requires: cockpit-shell >= 266
 Requires: udisks2 >= 2.9
-Recommends:     clevis-luks
-Recommends:     device-mapper-multipath
-Recommends:     udisks2-iscsi >= 2.9
 Recommends: udisks2-lvm2 >= 2.9
+Recommends: udisks2-iscsi >= 2.9
+Recommends: device-mapper-multipath
+Recommends: clevis-luks
 Requires: %{__python3}
 %if 0%{?suse_version}
 Requires: python3-dbus-python
@@ -736,8 +744,8 @@ systemctl reload-or-try-restart pmlogger
 %package -n cockpit-packagekit
 Summary: Cockpit user interface for packages
 BuildArch: noarch
-Requires:       PackageKit
 Requires: cockpit-bridge >= 186
+Requires: PackageKit
 Recommends: python3-tracer
 # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468
 Requires: polkit
@@ -751,4 +759,5 @@ via PackageKit.
 #/ build optional extension packages
 %endif
 
+# The changelog is automatically generated and merged
 %changelog