Update to 269-1

- Update to upstream 269 release

.gitignore

@@ -233,3 +233,4 @@
 /cockpit-267.tar.xz
 /cockpit-268.tar.xz
 /cockpit-268.1.tar.xz
+/cockpit-269.tar.xz

cockpit.spec

@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        268.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/268.1/cockpit-268.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})
@@ -173,14 +173,7 @@ Recommends: subscription-manager-cockpit
 %make_build
 
 %check
-exec 2>&1
-# 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 -j$(nproc) check
+make -j$(nproc) check
 
 %install
 %make_install
@@ -266,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
@@ -321,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
 
@@ -447,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
@@ -621,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}
@@ -690,6 +679,9 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu May 12 2022 Cockpit Project <cockpituous@gmail.com> - 269-1
+- Update to upstream 269 release
+
 * Thu Apr 28 2022 Cockpit Project <cockpituous@gmail.com> - 268.1-1
 - Update to upstream 268.1 release
 

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: "268.1"
+  ref: "269"
 execute:
   how: tmt

sources

@@ -1 +1 @@
-SHA512 (cockpit-268.1.tar.xz) = 094e290df72684f6e25031fe8cb8d195ea4f96356120b789f083e22aebaff5e38eceb2b41001d6dc8e03847768daf2205e7dd9b7e225897a74d54bfab33ccefa
+SHA512 (cockpit-269.tar.xz) = bc43d7fdb970a2b61941a924ac4aa3a03bb2268494ec11fc2c61341e83b5907f58c1d85f20c86c35d1bb407e8daac8aa3609718305ee2abad5f42995414596f1