public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Owen W. Taylor <otaylor@fishsoup.net>
To: git-commits@fedoraproject.org
Subject: [flatpaks/flatpak-runtime] f45: Add flatpak-runtime-config to the srpm-buildroot group
Date: Fri, 11 Sep 2026 14:41:22 GMT	[thread overview]
Message-ID: <178913768245.1.17310866806098112361.flatpaks-flatpak-runtime-be1ef9931a91@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : be1ef9931a91d7b60a332708dcc30b898d42d474
            Author : Owen W. Taylor <otaylor@fishsoup.net>
            Date   : 2020-10-01T23:05:51+02:00
            Stats  : +8/-0 in 3 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/be1ef9931a91d7b60a332708dcc30b898d42d474?branch=f45

            Log:
            Add flatpak-runtime-config to the srpm-buildroot group

When we are building a SRPM that in a module that buildrequires
flatpak-runtime, already built packages will be in the repositories
that are used to install the "srpm-build" packages. We might end
up with libraries in /app/lib[64] because of this, so we need
flatpak-runtime-config.

For example, the libreoffice build rebuilds libssh - this is a
dependency of curl, so having a rebuilt libssh without having
/app/lib[64] in the path breaks 'rhpkg-simple sources'.

Also include flatpak-rpm-macros - we don't expect that any macros
in there would change how a SRPM is built, but if they *do* change
how a SPRM is built, then we want them installed when building the
SRPM.

---
diff --git a/flatpak-runtime-baseonly.in.yaml b/flatpak-runtime-baseonly.in.yaml
index 0d82f23..f13df02 100644
--- a/flatpak-runtime-baseonly.in.yaml
+++ b/flatpak-runtime-baseonly.in.yaml
@@ -19,6 +19,8 @@ data:
             rpms: []
         buildroot:
             rpms: [flatpak-rpm-macros, flatpak-runtime-config]
+        srpm-buildroot:
+            rpms: [flatpak-rpm-macros, flatpak-runtime-config]
     api:
         rpms:
             - flatpak-rpm-macros

diff --git a/flatpak-runtime.in.yaml b/flatpak-runtime.in.yaml
index 7cbf91f..77ffee8 100644
--- a/flatpak-runtime.in.yaml
+++ b/flatpak-runtime.in.yaml
@@ -26,6 +26,8 @@ data:
             rpms: []
         buildroot:
             rpms: [flatpak-rpm-macros, flatpak-runtime-config]
+        srpm-buildroot:
+            rpms: [flatpak-rpm-macros, flatpak-runtime-config]
     api:
         rpms:
             - flatpak-rpm-macros

diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index ee3e772..51216cf 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -3367,6 +3367,10 @@ data:
       rpms:
       - flatpak-rpm-macros
       - flatpak-runtime-config
+    srpm-buildroot:
+      rpms:
+      - flatpak-rpm-macros
+      - flatpak-runtime-config
   api:
     rpms:
     - flatpak-rpm-macros

                 reply	other threads:[~2026-09-11 14:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178913768245.1.17310866806098112361.flatpaks-flatpak-runtime-be1ef9931a91@fedoraproject.org \
    --to=otaylor@fishsoup.net \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox