diff --git a/cockpit-235.tar.xz b/cockpit-235.tar.xz new file mode 100644 index 0000000..2fae8b1 --- /dev/null +++ b/cockpit-235.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cf395d8eee6042b57364b5822ac0fc9e7dae721217a171a86f878558035b896 +size 14843048 diff --git a/cockpit.changes b/cockpit.changes index 79d7331..de6cf87 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,7 +1,15 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Fri Nov 27 12:39:21 UTC 2020 - Ludwig Nussel -- new version 230 +- new version 232 https://cockpit-project.org/blog/cockpit-232.html https://cockpit-project.org/blog/cockpit-231.html diff --git a/cockpit.spec b/cockpit.spec index a05e052..8580c92 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -58,7 +58,7 @@ Summary: Web Console for Linux servers License: LGPL-2.1-or-later URL: https://cockpit-project.org/ -Version: 232 +Version: 235 %if %{defined wip} Release: 1.%{wip}%{?dist} Source0: cockpit-%{version}.tar.xz @@ -72,7 +72,8 @@ Source99: README.packaging # 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 @@ -200,23 +201,20 @@ rm -f %{buildroot}/%{_libdir}/cockpit/*.so 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 +260,9 @@ find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list 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 +287,7 @@ rm -f %{buildroot}%{_datadir}/metainfo/cockpit.appdata.xml # 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 @@ -374,10 +375,15 @@ troubleshooting, interactive command-line sessions, and more. 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 @@ -423,13 +429,14 @@ Obsoletes: cockpit-networkmanager 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. @@ -468,7 +475,7 @@ The Cockpit Web Service listens on the network, and authenticates users. 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 @@ -700,17 +707,6 @@ Cockpit support for reading PCP metrics and loading PCP archives. %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