From a245da10172e7676ae5e0d82e32859a6edf9e50b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Jul 16 2024 16:31:32 +0000 Subject: Merge remote-tracking branch 'fedora-fork/branch' into c10s-sig-hyperscale --- diff --git a/30846.patch b/30846.patch index f135830..ca9cffb 100644 --- a/30846.patch +++ b/30846.patch @@ -1,4 +1,4 @@ -From ca1344d04a9c1804234417dcfbd868524abc7ce6 Mon Sep 17 00:00:00 2001 +From 9e3d6b193d79ce447cd329617ada941f331570a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jan 2024 11:28:04 +0100 Subject: [PATCH] journal: again create user journals for users with high uids @@ -43,7 +43,7 @@ Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2251843. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/uid-classification.c b/src/basic/uid-classification.c -index e2d2cebc6d..2c8b06c0d3 100644 +index e2d2cebc6de27..2c8b06c0d3088 100644 --- a/src/basic/uid-classification.c +++ b/src/basic/uid-classification.c @@ -127,5 +127,5 @@ bool uid_for_system_journal(uid_t uid) { diff --git a/systemd.spec b/systemd.spec index c2c9791..e079124 100644 --- a/systemd.spec +++ b/systemd.spec @@ -53,7 +53,9 @@ License: LGPL-2.1-or-later AND MIT AND GPL-2.0-or-later Summary: System and Service Manager # download tarballs with "spectool -g systemd.spec" -%if %{defined commit} +%if %{defined branch} +Source0: https://github.com/systemd/systemd/archive/refs/heads/%{branch}.tar.gz +%elif %{defined commit} Source0: https://github.com/systemd/systemd/archive/%{commit}/%{name}-%{shortcommit}.tar.gz %else Source0: https://github.com/systemd/systemd/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz @@ -672,7 +674,13 @@ other libraries from systemd-libs. This package conflicts with the main systemd package and is meant for use in exitrds. %prep -%autosetup -n %{?commit:%{name}-%{commit}}%{!?commit:%{name}-%{version_no_tilde}} -p1 +%if %{defined branch} +%autosetup -n %{name}-%{branch} +%elif %{defined commit} +%autosetup -n %{name}-%{commit} +%else +%autosetup -n %{name}-%{version_no_tilde} -p1 +%endif %build %global ntpvendor %(source /etc/os-release; echo ${ID})