From afcdd540414ae8c20a8edcd5896d151b25ace0ac Mon Sep 17 00:00:00 2001 From: Jordan Pryde Date: Sat, 28 Sep 2024 16:20:56 -0700 Subject: [PATCH 1/2] disable kf6-ksvg spec --- rpm-builds/specs/{kf6-ksvg.spec => kf6-ksvg.spec.disable} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rpm-builds/specs/{kf6-ksvg.spec => kf6-ksvg.spec.disable} (100%) diff --git a/rpm-builds/specs/kf6-ksvg.spec b/rpm-builds/specs/kf6-ksvg.spec.disable similarity index 100% rename from rpm-builds/specs/kf6-ksvg.spec rename to rpm-builds/specs/kf6-ksvg.spec.disable From a03c607e70cdc00d1d400a1ad3fbfc87dd4e7187 Mon Sep 17 00:00:00 2001 From: Jordan Pryde Date: Sat, 28 Sep 2024 16:43:34 -0700 Subject: [PATCH 2/2] fix containerfile for rpm-builds --- rpm-builds/Containerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rpm-builds/Containerfile b/rpm-builds/Containerfile index 899236d..127ab83 100644 --- a/rpm-builds/Containerfile +++ b/rpm-builds/Containerfile @@ -1,4 +1,4 @@ -FROM quay.io/fedora/fedora:rawhide as builder +FROM quay.io/fedora/fedora:rawhide AS builder RUN \ --mount=type=cache,dst=/var/cache/dnf,id=dnf,sharing=locked \ dnf -y install fedora-packager rpmdevtools gcc bash \ @@ -26,8 +26,9 @@ RUN \ && echo *.spec | xargs -n 1 -P 1 -- spectool -g -R \ && rpmbuild -ba *.spec \ && mkdir -p /home/builder/rpmbuild/RPMS/noarch /home/builder/rpmbuild/RPMS/repo \ + && shopt -s nullglob \ && cp -a /home/builder/rpmbuild/RPMS/x86_64/* /home/builder/rpmbuild/RPMS/noarch/* /home/builder/rpmbuild/RPMS/repo \ && createrepo /home/builder/rpmbuild/RPMS/repo -FROM scratch as repo +FROM scratch AS repo COPY --from=builder /home/builder/rpmbuild/RPMS/repo /