diff --git a/.gitignore b/.gitignore index f4ca8db..7fe3279 100644 --- a/.gitignore +++ b/.gitignore @@ -228,4 +228,9 @@ /cockpit-262.tar.xz /cockpit-263.tar.xz /cockpit-264.tar.xz -/cockpit-264.1.tar.xz +/cockpit-265.tar.xz +/cockpit-266.tar.xz +/cockpit-267.tar.xz +/cockpit-268.tar.xz +/cockpit-268.1.tar.xz +/cockpit-269.tar.xz diff --git a/cockpit.spec b/cockpit.spec index f0718ce..0162884 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 264.1 +Version: 269 Release: 1%{?dist} # # Copyright (C) 2014-2020 Red Hat, Inc. @@ -52,7 +52,7 @@ Summary: Web Console for Linux servers License: LGPLv2+ URL: https://cockpit-project.org/ -Source0: https://github.com/cockpit-project/cockpit/releases/download/264.1/cockpit-264.1.tar.xz +Source0: https://github.com/cockpit-project/cockpit/releases/download/269/cockpit-269.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}) @@ -90,7 +90,13 @@ BuildRequires: pam-devel BuildRequires: autoconf 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 +BuildRequires: libappstream-glib-devel +%else +BuildRequires: gettext >= 0.21 +%endif %if 0%{?build_basic} BuildRequires: libssh-devel >= 0.8.5 %endif @@ -167,20 +173,7 @@ Recommends: subscription-manager-cockpit %make_build %check -exec 2>&1 -# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909 -%if 0%{?fedora} >= 0 -%ifarch s390x -%define testsuite_fail || true -%endif -%endif -# HACK: RHEL i686 builders hang after running all tests; not a supported architecture, so don't bother -%if 0%{?rhel} >= 8 -%ifarch i686 -%define testsuite_skip # -%endif -%endif -%{?testsuite_skip} make -j4 check %{?testsuite_fail} +make -j$(nproc) check %install %make_install @@ -191,8 +184,15 @@ 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%{?rhel} <= 8 - ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz +%if 0%{?rhel} == 8 + if [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css.gz ]; then + ln -s cockpit.css.gz %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css.gz + elif [ -f %{buildroot}/%{_datadir}/cockpit/base1/cockpit.css ]; then + ln -s cockpit.css %{buildroot}/%{_datadir}/cockpit/base1/patternfly.css + else + echo >&2 Neither cockpit.css.gz nor cockpit.css exists. + exit 1 + fi %endif # Build the package lists for resource packages @@ -259,7 +259,7 @@ for pkg in base1 branding motd kdump networkmanager selinux shell sosreport ssh rm -r %{buildroot}/%{_datadir}/cockpit/$pkg rm -f %{buildroot}/%{_datadir}/metainfo/org.cockpit-project.cockpit-${pkg}.metainfo.xml done -for data in doc locale man pixmaps polkit-1; do +for data in doc man pixmaps polkit-1; do rm -r %{buildroot}/%{_datadir}/$data done for lib in systemd tmpfiles.d; do @@ -314,10 +314,6 @@ rm -f %{buildroot}%{_datadir}/metainfo/org.cockpit-project.cockpit-selinux.metai rm -f %{buildroot}%{_datadir}/pixmaps/cockpit-sosreport.png %endif -%if 0%{?build_basic} -%find_lang cockpit -%endif - # ------------------------------------------------------------------------------- # Basic Sub-packages @@ -440,7 +436,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 -f static.list +%files ws -f static.list %doc %{_mandir}/man1/cockpit-desktop.1.gz %doc %{_mandir}/man5/cockpit.conf.5.gz %doc %{_mandir}/man8/cockpit-ws.8.gz @@ -536,8 +532,8 @@ fi %package kdump Summary: Cockpit user interface for kernel crash dumping -Requires: cockpit-bridge >= 122 -Requires: cockpit-shell >= 122 +Requires: cockpit-bridge >= 130 +Requires: cockpit-shell >= 130 Requires: kexec-tools BuildArch: noarch @@ -614,9 +610,9 @@ Dummy package from building optional packages only; never install or publish me. %package -n cockpit-storaged Summary: Cockpit user interface for storage, using udisks Requires: cockpit-shell >= 186 -Requires: udisks2 >= 2.6 -Recommends: udisks2-lvm2 >= 2.6 -Recommends: udisks2-iscsi >= 2.6 +Requires: udisks2 >= 2.9 +Recommends: udisks2-lvm2 >= 2.9 +Recommends: udisks2-iscsi >= 2.9 Recommends: device-mapper-multipath Recommends: clevis-luks Requires: %{__python3} @@ -683,9 +679,23 @@ via PackageKit. # The changelog is automatically generated and merged %changelog -* Thu Mar 03 2022 Martin Pitt - 264.1-1 -- metrics: Fix link construction for user services -- Translation updates (rhbz#2017340) +* Thu May 12 2022 Cockpit Project - 269-1 +- Update to upstream 269 release + +* Thu Apr 28 2022 Cockpit Project - 268.1-1 +- Update to upstream 268.1 release + +* Thu Apr 28 2022 Cockpit Project - 268-1 +- Update to upstream 268 release + +* Wed Apr 13 2022 Cockpit Project - 267-1 +- Update to upstream 267 release + +* Wed Mar 30 2022 Cockpit Project - 266-1 +- Update to upstream 266 release + +* Wed Mar 16 2022 Cockpit Project - 265-1 +- Update to upstream 265 release * Fri Feb 25 2022 Cockpit Project - 264-1 - Update to upstream 264 release diff --git a/plans/upstream.fmf b/plans/upstream.fmf index 9c4e64d..f253b9f 100644 --- a/plans/upstream.fmf +++ b/plans/upstream.fmf @@ -2,8 +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: "264" - # 264 + skipping of TestPages.testBasic - ref: "d66df49b4350f40cf1bee138c9493b1b2a0c3a80" + ref: "269" execute: how: tmt diff --git a/sources b/sources index 09eedfd..9977590 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cockpit-264.1.tar.xz) = 620f719aae340d9cc97efb6b067c967e622046b486a3a398093b1ddf87e0269f1e3c755f2c57faecddf9656fd7cff542baef81d534a20a87d1557c06571d7270 +SHA512 (cockpit-269.tar.xz) = bc43d7fdb970a2b61941a924ac4aa3a03bb2268494ec11fc2c61341e83b5907f58c1d85f20c86c35d1bb407e8daac8aa3609718305ee2abad5f42995414596f1