fix spec cleaner changes ...

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

cockpit.spec

@@ -1,22 +1,32 @@
 #
-# spec file for package cockpit
-#
-# Copyright (c) 2024 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; 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
@@ -98,25 +108,24 @@ Patch104:       selinux_libdir.patch
 %define with_selinux 1
 
 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:  gettext >= 0.21
-BuildRequires:  glib-networking
-BuildRequires:  gnutls-devel >= 3.4.3
-BuildRequires:  libssh-devel >= 0.8.5
-BuildRequires:  libxslt-devel
 BuildRequires: make
-BuildRequires:  openssl-devel
+BuildRequires: /usr/bin/python3
 BuildRequires: python3-devel
-BuildRequires:  sed
+BuildRequires: gettext >= 0.21
+BuildRequires: libssh-devel >= 0.8.5
+BuildRequires: openssl-devel
+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
@@ -125,12 +134,12 @@ BuildRequires:  pkgconfig(libsystemd) >= 235
 BuildRequires: distribution-release
 %if %{build_pcp}
 BuildRequires: libpcp-devel
+BuildRequires: pcp-devel
 BuildRequires: libpcp3
 BuildRequires: libpcp_import1
-BuildRequires:  pcp-devel
 %endif
-BuildRequires:  distribution-logos
 BuildRequires: openssh
+BuildRequires: distribution-logos
 BuildRequires: wallpaper-branding
 # needed for /var/lib/pcp directory ownership
 BuildRequires: pcp
@@ -138,11 +147,11 @@ BuildRequires:  pcp
 %if %{build_pcp}
 BuildRequires: pcp-libs-devel
 %endif
-BuildRequires:  docbook-style-xsl
 BuildRequires: openssh-clients
+BuildRequires: docbook-style-xsl
 %endif
-BuildRequires:  gdb
 BuildRequires: krb5-server
+BuildRequires: gdb
 
 # For documentation
 BuildRequires: xmlto
@@ -155,15 +164,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)
@@ -445,17 +454,18 @@ 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
@@ -489,9 +499,9 @@ Requires:       cockpit-bridge >= %{version}-%{release}
 %if !0%{?suse_version}
 Requires: shadow-utils
 %endif
-Requires:       /usr/bin/date
-Requires:       /usr/bin/pwscore
 Requires: grep
+Requires: /usr/bin/pwscore
+Requires: /usr/bin/date
 Provides: cockpit-shell = %{version}-%{release}
 Provides: cockpit-systemd = %{version}-%{release}
 Provides: cockpit-tuned = %{version}-%{release}
@@ -525,8 +535,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
 %if 0%{?with_selinux}
 Requires: (selinux-policy >= %{_selinux_policy_version} if selinux-policy-%{selinuxtype})
 Requires(post): (policycoreutils if selinux-policy-%{selinuxtype})
@@ -724,9 +734,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
@@ -764,22 +774,22 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
 
 %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_btrfs >= 2.9
 Requires: libudisks2-0_lvm2 >= 2.9
+Requires: libudisks2-0_btrfs >= 2.9
 Recommends: multipath-tools
 Requires: python3-dbus-python
 %else
-Recommends:     udisks2-iscsi >= 2.9
 Recommends: udisks2-lvm2 >= 2.9
+Recommends: udisks2-iscsi >= 2.9
 %if ! 0%{?rhel}
 Recommends: udisks2-btrfs >= 2.9
 %endif
-Recommends:     clevis-luks
 Recommends: device-mapper-multipath
+Recommends: clevis-luks
 Requires: python3-dbus
 %endif
 BuildArch: noarch
@@ -840,8 +850,8 @@ systemctl reload-or-try-restart pmlogger
 %package -n cockpit-packagekit
 Summary: Cockpit user interface for packages
 BuildArch: noarch
-Requires:       PackageKit
 Requires: cockpit-bridge >= %{required_base}
+Requires: PackageKit
 Recommends: python3-tracer
 # HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1800468
 Requires: polkit
@@ -852,4 +862,5 @@ via PackageKit.
 
 %files -n cockpit-packagekit -f packagekit.list
 
+# The changelog is automatically generated and merged
 %changelog