From 504fa493486ae06ad5fd02d134760928793267b38b3ed37c2d7d02c00cde061e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 21 Feb 2025 09:29:38 +0000 Subject: [PATCH] [info=de4b8becd9c83bea352cf5f0f707807082e022a1e5473186a39cb1c5d58e2013] OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=215 --- _scmsync.obsinfo | 8 ++++---- build.specials.obscpio | 2 +- cockpit.changes | 7 +++++++ cockpit.spec | 3 +-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 2645d2a..328cbea 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,5 +1,5 @@ -mtime: 1740090299 -commit: 783d2e3bb195c6409132c66eb04c36d0232372b201170fc36d853c9dbdd3cdb0 +mtime: 1740129393 +commit: de4b8becd9c83bea352cf5f0f707807082e022a1e5473186a39cb1c5d58e2013 url: https://src.opensuse.org/cockpit/cockpit.git -revision: 783d2e3bb195c6409132c66eb04c36d0232372b201170fc36d853c9dbdd3cdb0 -projectscmsync: https://src.opensuse.org/cockpit/_ObsPrj.git#6afc009e3ae4f54a1bc4208d8bbab86c16397236aec2eca493700e2ac87e1ff4 +revision: de4b8becd9c83bea352cf5f0f707807082e022a1e5473186a39cb1c5d58e2013 +projectscmsync: https://src.opensuse.org/cockpit/_ObsPrj.git#64e9cfa9f6042fa7adfdd4b37913eb3942c31e4934277b1b3dd1de2176db4f01 diff --git a/build.specials.obscpio b/build.specials.obscpio index 3fb75db..3315a55 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:726d587120395772861f0fced00a006f58ca3fc73b181607f2586588ddd8d6b1 +oid sha256:3bf7304920353eb3a6329abecbbaff3c30aae7147cf5408f58e23129a93f73bf size 256 diff --git a/cockpit.changes b/cockpit.changes index 968e2c0..83c39b3 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 21 08:03:00 UTC 2025 - Alice Brooks + +- Always apply 0007-Remove-DynamicUser-setting-as-these-conflict-with-re.patch + for every build system. Fixes bsc#1237451 + ------------------------------------------------------------------- Thu Feb 20 22:22:32 UTC 2025 - Miika Alikirri @@ -59,6 +65,7 @@ Mon Nov 25 06:18:44 UTC 2024 - Luna D Dragon * 323: - login: Prevent multiple logins in a single browser session - Update documentation links + ------------------------------------------------------------------- Wed Oct 9 12:14:14 UTC 2024 - Alice Brooks diff --git a/cockpit.spec b/cockpit.spec index f075575..9e30b0e 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -214,7 +214,7 @@ BuildRequires: python3-pytest-timeout %patch -P 4 -p1 %patch -P 5 -p1 %patch -P 106 -p1 - +%patch -P 108 -p1 # SLE Micro specific patches %if 0%{?is_smo} @@ -230,7 +230,6 @@ BuildRequires: python3-pytest-timeout %patch -P 103 -p1 %patch -P 104 -p1 %patch -P 105 -p1 -%patch -P 108 -p1 %else %patch -P 107 -p1 %endif