From 196ec98228ac7ba72652635e29fbdfdf1b88a2a4 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Aug 28 2024 08:22:26 +0000
Subject: Drop %upstream conditionalization for patches


rpm will imply --noprep when using --build-in-place in rpm 4.20 and
we're switching the mkosi rpm builds to use --noprep as well on older
rpm versions. This means we don't need to gate out patch applications
anymore with the %upstream macro.

---

diff --git a/systemd.spec b/systemd.spec
index 2ebce1d..0b107ef 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -108,7 +108,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[
 # than in the next section. Packit CI will drop any patches in this range before
 # applying upstream pull requests.
 
-%if %{without upstream}
 %if 0%{?fedora} < 40 && 0%{?rhel} < 10
 # Work-around for dracut issue: run generators directly when we are in initrd
 # https://bugzilla.redhat.com/show_bug.cgi?id=2164404
@@ -125,7 +124,6 @@ Patch0491:      https://github.com/systemd/systemd/pull/30846.patch
 
 # Soft-disable tmpfiles --purge until a good use case comes up.
 Patch0492:      0001-tmpfiles-make-purge-hard-to-mis-use.patch
-%endif
 
 # Adjust upstream config to use our shared stack
 Patch0499:      fedora-use-system-auth-in-pam-systemd-user.patch