From d3f84ccceaa7cf95dfbd6b7221ab44b0d3fed0ea Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Dec 05 2024 20:55:50 +0000 Subject: Remove unnecessary autopatch undefine from 61c859ba8b2810 We recently fixed systemd-cd repo with: https://gitlab.com/CentOS/Hyperscale/releng/systemd-releng/-/merge_requests/22 So this hack is no longer necessary. --- diff --git a/systemd.spec b/systemd.spec index 828ba91..527971b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -739,6 +739,8 @@ main systemd package and is meant for use in exitrds. %prep %if 0%{?facebook} && %{with upstream} +# For systemd-cd (https://gitlab.com/CentOS/Hyperscale/releng/systemd-releng) builds, +# we want to allow certain patches to accelerate internal projects. # Call autosetup but disable patch management, we'll do that with autopatch below %if %{defined branch} @@ -749,12 +751,6 @@ main systemd package and is meant for use in exitrds. %autosetup -N -n %{name}-%{version_no_tilde} %endif -# systemd-cd build defines autopatch as true to disable autopatch so undo this -# https://gitlab.com/CentOS/Hyperscale/releng/systemd-releng -%if 0%{?autopatch} -%undefine autopatch -%endif - # Now only install only patches in the specific Meta-only range %autopatch -m 1001 -M 1100 -p1