Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cockpit for openSUSE:Factory checked in at 2021-02-01 14:41:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cockpit (Old)
and /work/SRC/openSUSE:Factory/.cockpit.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cockpit"
Mon Feb 1 14:41:54 2021 rev:11 rq:867727 version:235
Changes:
--------
--- /work/SRC/openSUSE:Factory/cockpit/cockpit.changes 2020-12-10 15:56:38.718770234 +0100
+++ /work/SRC/openSUSE:Factory/.cockpit.new.28504/cockpit.changes 2021-02-01 14:41:56.624688437 +0100
@@ -1,0 +2,8 @@
+Fri Jan 22 08:53:25 UTC 2021 - Ludwig Nussel
+
+- new version 235
+ https://cockpit-project.org/blog/cockpit-235.html
+ https://cockpit-project.org/blog/cockpit-234.html
+ https://cockpit-project.org/blog/cockpit-233.html
+
+-------------------------------------------------------------------
@@ -4 +12 @@
-- new version 230
+- new version 232
Old:
----
cockpit-232.tar.xz
New:
----
cockpit-235.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cockpit.spec ++++++
--- /var/tmp/diff_new_pack.geJMK9/_old 2021-02-01 14:41:57.536689745 +0100
+++ /var/tmp/diff_new_pack.geJMK9/_new 2021-02-01 14:41:57.536689745 +0100
@@ -1,33 +1,21 @@
#
-# Copyright (C) 2014-2020 Red Hat, Inc.
-#
-# Cockpit is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
+# spec file for package cockpit
#
-# Cockpit is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with Cockpit; If not, see http://www.gnu.org/licenses/.
+# Copyright (c) 2021 SUSE LLC
+# Copyright (C) 2014-2020 Red Hat, Inc.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# 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
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-# This file is maintained at the following location:
-# https://github.com/cockpit-project/cockpit/blob/master/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
-#
-# Globals that may be defined elsewhere
-# * Version 122
-# * wip 1
-#
+
# 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
@@ -54,16 +42,15 @@
Name: cockpit
Summary: Web Console for Linux servers
-
License: LGPL-2.1-or-later
+
URL: https://cockpit-project.org/
-Version: 232
+Version: 235
+Release: 0
%if %{defined wip}
-Release: 1.%{wip}%{?dist}
Source0: cockpit-%{version}.tar.xz
%else
-Release: 0
Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz
%endif
Source1: cockpit.pam
@@ -72,7 +59,8 @@
# in RHEL the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
# and cockpit-appstream (building optional packages like cockpit-{machines,pcp})
-%if 0%{?rhel}
+# This split does not apply to EPEL/COPR.
+%if 0%{?rhel} && 0%{?epel} == 0
%if "%{name}" == "cockpit"
%define build_basic 1
@@ -88,45 +76,46 @@
%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: gettext >= 0.19.7
+BuildRequires: make
%if 0%{?build_basic}
BuildRequires: libssh-devel >= 0.8.5
%endif
-BuildRequires: openssl-devel
+BuildRequires: glib-networking
BuildRequires: gnutls-devel >= 3.4.3
-BuildRequires: zlib-devel
-BuildRequires: pkgconfig(krb5) >= 1.11
BuildRequires: libxslt-devel
-BuildRequires: glib-networking
+BuildRequires: openssl-devel
BuildRequires: sed
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig(krb5) >= 1.11
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
%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
@@ -135,8 +124,8 @@
# 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)
@@ -200,23 +189,20 @@
install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
# only ship deprecated PatternFly API for stable releases
-%if 0%{?fedora} > 33 || 0%{?rhel} > 8
- rm %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css
+%if 0%{?fedora} <= 33 || 0%{?rhel} <= 8
+ ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz
%endif
# Build the package lists for resource packages
echo '%dir %{_datadir}/cockpit/base1' > base.list
echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list
-find %{buildroot}%{_datadir}/cockpit/base1 -type f >> base.list
+find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
echo %{buildroot}%{_datadir}/polkit-1/actions/org.cockpit-project.cockpit-bridge.policy >> base.list
echo '%dir %{_datadir}/cockpit/ssh' >> base.list
find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
echo '%{_libexecdir}/cockpit-ssh' >> base.list
-echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list
-find %{buildroot}%{_datadir}/cockpit/dashboard -type f >> dashboard.list
-
echo '%dir %{_datadir}/cockpit/pcp' >> pcp.list
find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list
@@ -262,6 +248,9 @@
echo '%dir %{_datadir}/cockpit/playground' > tests.list
find %{buildroot}%{_datadir}/cockpit/playground -type f >> tests.list
+echo '%dir %{_datadir}/cockpit/static' > static.list
+find %{buildroot}%{_datadir}/cockpit/static -type f >> static.list
+
# when not building basic packages, remove their files
%if 0%{?build_basic} == 0
for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh static systemd tuned users metrics; do
@@ -286,7 +275,7 @@
# when not building optional packages, remove their files
%if 0%{?build_optional} == 0
-for pkg in apps dashboard machines packagekit pcp playground storaged; do
+for pkg in apps machines packagekit pcp playground storaged; do
rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg %{buildroot}/usr/src/debug/%{_datadir}/cockpit/$pkg
done
# files from -tests
@@ -369,15 +358,19 @@
%{_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}
-# cockpit-ssh moved from dashboard to bridge in 171
-Conflicts: cockpit-dashboard < 170.x
# PR #10430 dropped workaround for ws' inability to understand x-host-key challenge
Conflicts: cockpit-ws < 181.x
+# 233 dropped jquery.js, pages started to bundle it (commit 049e8b8dce)
+Conflicts: cockpit-dashboard < 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
@@ -410,9 +403,9 @@
%if !0%{?suse_version}
Requires: shadow-utils
%endif
-Requires: grep
-Requires: /usr/bin/pwscore
Requires: /usr/bin/date
+Requires: /usr/bin/pwscore
+Requires: grep
Provides: cockpit-shell = %{version}-%{release}
Provides: cockpit-systemd = %{version}-%{release}
Provides: cockpit-tuned = %{version}-%{release}
@@ -423,13 +416,14 @@
Requires: NetworkManager >= 1.6
Provides: cockpit-kdump = %{version}-%{release}
Requires: kexec-tools
-Recommends: polkit
+Recommends: (sudo or polkit)
Recommends: PackageKit
Recommends: NetworkManager-team
Recommends: setroubleshoot-server >= 3.3.3
Provides: cockpit-selinux = %{version}-%{release}
Provides: cockpit-sosreport = %{version}-%{release}
Requires: sos
+Obsoletes: cockpit-dashboard
%endif
%if 0%{?fedora} >= 29
# 0.7.0 (actually) supports task cancellation.
@@ -452,8 +446,8 @@
%package ws
Summary: Cockpit Web Service
Requires: glib-networking
-Requires: openssl
Requires: glib2 >= 2.50.0
+Requires: openssl
Conflicts: firewalld < 0.6.0-1
Recommends: sscg >= 2.3
Recommends: system-logos
@@ -468,7 +462,7 @@
If sssd-dbus is installed, you can enable client certificate/smart card
authentication via sssd/FreeIPA.
-%files ws -f cockpit.lang
+%files ws -f cockpit.lang -f static.list
%doc %{_mandir}/man1/cockpit-desktop.1.gz
%doc %{_mandir}/man5/cockpit.conf.5.gz
%doc %{_mandir}/man8/cockpit-ws.8.gz
@@ -576,9 +570,9 @@
%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
@@ -648,9 +642,10 @@
%package -n cockpit-tests
Summary: Tests for Cockpit
+Requires: /usr/bin/ssh-add
+Requires: /usr/bin/ssh-agent
Requires: cockpit-bridge >= 138
Requires: cockpit-system >= 138
-Requires: /usr/bin/ssh-agent /usr/bin/ssh-add
Provides: cockpit-test-assets = %{version}-%{release}
%description -n cockpit-tests
@@ -700,22 +695,11 @@
%post -n cockpit-pcp
systemctl reload-or-try-restart pmlogger
-%package -n cockpit-dashboard
-Summary: Cockpit remote server dashboard
-BuildArch: noarch
-Requires: cockpit-ssh >= 135
-Conflicts: cockpit-ws < 135
-
-%description -n cockpit-dashboard
-Cockpit page for showing performance graphs for up to 20 remote servers.
-
-%files -n cockpit-dashboard -f dashboard.list
-
%package -n cockpit-packagekit
Summary: Cockpit user interface for packages
BuildArch: noarch
-Requires: cockpit-bridge >= 186
Requires: PackageKit
+Requires: cockpit-bridge >= 186
%description -n cockpit-packagekit
The Cockpit components for installing OS updates and Cockpit add-ons,
@@ -727,4 +711,5 @@
%endif
# The changelog is automatically generated and merged
+
%changelog
++++++ cockpit-232.tar.xz -> cockpit-235.tar.xz ++++++
/work/SRC/openSUSE:Factory/cockpit/cockpit-232.tar.xz /work/SRC/openSUSE:Factory/.cockpit.new.28504/cockpit-235.tar.xz differ: char 26, line 1