From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 7 Dec 2023 08:36:52 +0000 (+0100)
Subject: packit: don't take ownership of /etc/ssh/sshd_config.d/
X-Git-Tag: v256-rc1~1558
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f7d1899235a237ba7a6000479cbf3965b224fd9;p=thirdparty%2Fsystemd.git

packit: don't take ownership of /etc/ssh/sshd_config.d/

7e3607996a creates a symlink under /etc/ssh/sshd_config.d/ and with
current Rawhide RPM stuff the systemd RPM tries to take ownership of
that directory which conflicts with the openssh-server package. Let's
temporarily tweak the regex in split-files.py until this changes makes
it to Rawhide.
---

diff --git a/.packit.yml b/.packit.yml
index b886632a95d..773c8f79da2 100644
--- a/.packit.yml
+++ b/.packit.yml
@@ -32,8 +32,10 @@ actions:
     # [0] https://github.com/mesonbuild/meson/issues/7360
     # [1] https://github.com/systemd/systemd/pull/18908#issuecomment-792250110
     - 'sed -i "/^CONFIGURE_OPTS=(/a--werror" .packit_rpm/systemd.spec'
-    # Ignore unpackages standalone binaries
+    # Ignore unpackaged standalone binaries
     - "sed -i 's/assert False,.*/pass/' .packit_rpm/split-files.py"
+    # Don't take ownership of /etc/ssh/sshd_config.d/
+    - "sed -i '/\\/usr\\/share\\/dbus-1\\$/a\\/etc\\/ssh\\/sshd_config.d\\$\\|' .packit_rpm/split-files.py"
 
 jobs:
 - job: copr_build