From 0cfd55655f3c0e65a116c789bae9545cc4a43e6b Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Mon, 24 Jan 2022 15:19:00 +0000 Subject: [PATCH] Update to 261-1 - Update to upstream 261 release --- .gitignore | 1 + cockpit.spec | 38 +++++++++++++++++--------------------- plans/upstream.fmf | 2 +- sources | 2 +- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index aaa3b51..40eabdc 100644 --- a/.gitignore +++ b/.gitignore @@ -224,3 +224,4 @@ /cockpit-258.tar.xz /cockpit-259.tar.xz /cockpit-260.tar.xz +/cockpit-261.tar.xz diff --git a/cockpit.spec b/cockpit.spec index 68c9e7a..fb7ded2 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 260 -Release: 2%{?dist} +Version: 261 +Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. # @@ -26,10 +26,6 @@ Release: 2%{?dist} # # 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 @@ -56,17 +52,15 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -%if %{defined wip} -Source0: cockpit-%{version}.tar.xz -%else -Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz -%endif +Source0: https://github.com/cockpit-project/cockpit/releases/download/261/cockpit-261.tar.xz # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system}) # and cockpit-appstream (building optional packages like cockpit-{pcp}) # This split does not apply to EPEL/COPR. # In Fedora ELN/RHEL 9+ there is just one source package, which ships rpms in both BaseOS and AppStream -%if 0%{?rhel} == 8 && 0%{?epel} == 0 +# We also provide an override mechanism if you want to build all packages. +%define build_all 0 +%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !%{build_all} %if "%{name}" == "cockpit" %define build_basic 1 @@ -161,12 +155,10 @@ Recommends: subscription-manager-cockpit %setup -q -n cockpit-%{version} %build -exec 2>&1 %configure \ --disable-silent-rules \ --with-cockpit-user=cockpit-ws \ --with-cockpit-ws-instance-user=cockpit-wsinstance \ - --with-selinux-config-type=etc_t \ %if 0%{?suse_version} --docdir=%_defaultdocdir/%{name} \ %endif @@ -175,10 +167,11 @@ exec 2>&1 --disable-ssh \ %endif -make -j4 %{?extra_flags} all +make -j$(nproc) %{?extra_flags} all %if 0%{?with_selinux} make -f /usr/share/selinux/devel/Makefile cockpit.pp + rm -f cockpit.pp.bz2 bzip2 -9 cockpit.pp %endif @@ -231,10 +224,10 @@ 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/pcp' >> pcp.list +echo '%dir %{_datadir}/cockpit/pcp' > pcp.list find %{buildroot}%{_datadir}/cockpit/pcp -type f >> pcp.list -echo '%dir %{_datadir}/cockpit/tuned' >> system.list +echo '%dir %{_datadir}/cockpit/tuned' > system.list find %{buildroot}%{_datadir}/cockpit/tuned -type f >> system.list echo '%dir %{_datadir}/cockpit/shell' >> system.list @@ -249,7 +242,7 @@ find %{buildroot}%{_datadir}/cockpit/users -type f >> system.list echo '%dir %{_datadir}/cockpit/metrics' >> system.list find %{buildroot}%{_datadir}/cockpit/metrics -type f >> system.list -echo '%dir %{_datadir}/cockpit/kdump' >> kdump.list +echo '%dir %{_datadir}/cockpit/kdump' > kdump.list find %{buildroot}%{_datadir}/cockpit/kdump -type f >> kdump.list echo '%dir %{_datadir}/cockpit/sosreport' > sosreport.list @@ -261,7 +254,7 @@ find %{buildroot}%{_datadir}/cockpit/storaged -type f >> storaged.list echo '%dir %{_datadir}/cockpit/networkmanager' > networkmanager.list find %{buildroot}%{_datadir}/cockpit/networkmanager -type f >> networkmanager.list -echo '%dir %{_datadir}/cockpit/packagekit' >> packagekit.list +echo '%dir %{_datadir}/cockpit/packagekit' > packagekit.list find %{buildroot}%{_datadir}/cockpit/packagekit -type f >> packagekit.list echo '%dir %{_datadir}/cockpit/apps' >> packagekit.list @@ -535,8 +528,8 @@ fi # set up dynamic motd/issue symlinks on first-time install; don't bring them back on upgrades if admin removed them if [ "$1" = 1 ]; then mkdir -p /etc/motd.d /etc/issue.d - ln -s /run/cockpit/motd /etc/motd.d/cockpit - ln -s /run/cockpit/motd /etc/issue.d/cockpit.issue + ln -s ../../run/cockpit/motd /etc/motd.d/cockpit + ln -s ../../run/cockpit/motd /etc/issue.d/cockpit.issue fi %tmpfiles_create cockpit-tempfiles.conf @@ -718,6 +711,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Mon Jan 24 2022 Cockpit Project - 261-1 +- Update to upstream 261 release + * Wed Jan 19 2022 Fedora Release Engineering - 260-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/plans/upstream.fmf b/plans/upstream.fmf index 3bd06e3..08290ad 100644 --- a/plans/upstream.fmf +++ b/plans/upstream.fmf @@ -2,6 +2,6 @@ discover: how: fmf repository: https://github.com/cockpit-project/cockpit # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585 - ref: "260" + ref: "261" execute: how: tmt diff --git a/sources b/sources index bb78610..0a2d9d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-260.tar.xz) = 515158879bce2096df76b9f955357e4e64f74abba6d6dc8e2c4c1d09dc1cd16ad57bbe9f1a935b7e4779501af6931f7c2e11636c523a46a6a37fe67b86e81fa0 +SHA512 (cockpit-261.tar.xz) = 41b31783607cb9c4a6434b5591d66d0556acf97147a87aa95eaf4bba7fea30cf65877ce7ee0f0e3c9115dc225979f45552bd2670786101cd0810be680bef3707