mkosi: workaround for opensuse spec file to pick up new import-pubring filename

diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
index ea1acb62f50b911455019774fa01434923f4ce64..84a38a51a7e0ad79e66f28c651fd99206e22cb06 100755 (executable)
--- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
+++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot
@@ -19,9 +19,9 @@ TS="${SOURCE_DATE_EPOCH:-$(date +%s)}"
 # disable manpage compression as the files cannot be found. Fix the issue by removing the compression
 # extension.
 #
-# TODO: remove manual cgroups-agent patch when the upstream spec is updated
+# TODO: remove manual cgroups-agent and pubring patches when the upstream spec is updated
 while read -r filelist; do
-    sed 's/\.gz$//; /systemd-cgroups-agent/d' "$filelist" >"/tmp/$(basename "$filelist")"
+    sed 's/\.gz$//; /systemd-cgroups-agent/d; s/import-pubring.gpg/import-pubring.pgp/' "$filelist" >"/tmp/$(basename "$filelist")"
     mount --bind "/tmp/$(basename "$filelist")" "$filelist"
 done < <(find "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}" -name "files.*")