public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Kalev Lember <klember@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/flatpak-runtime-config] f45: Install flatpak-builder defaults.json config file
Date: Thu, 10 Sep 2026 21:21:46 GMT	[thread overview]
Message-ID: <178907530612.1.17101052779269735845.rpms-flatpak-runtime-config-23a68b312c6f@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/flatpak-runtime-config
            Branch : f45
            Commit : 23a68b312c6f9bb542f6e416e44af267a1ad1a42
            Author : Kalev Lember <klember@redhat.com>
            Date   : 2021-02-02T12:41:33+01:00
            Stats  : +22/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/flatpak-runtime-config/c/23a68b312c6f9bb542f6e416e44af267a1ad1a42?branch=f45

            Log:
            Install flatpak-builder defaults.json config file

This makes it easier to use the Fedora flatpak SDK when building with
flatpak-builder (as opposed to building flatpaks in koji).

---
diff --git a/defaults.json.in b/defaults.json.in
new file mode 100644
index 0000000..709d182
--- /dev/null
+++ b/defaults.json.in
@@ -0,0 +1,7 @@
+{
+  "libdir": "%{_libdir}",
+  "cflags": "%{build_cflags}",
+  "cxxflags": "%{build_cxxflags}",
+  "cppflags": "",
+  "ldflags": "-L/app/lib %{build_ldflags}"
+}

diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index a49eeb5..0e05a9a 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -1,11 +1,12 @@
 Name:           flatpak-runtime-config
-Version:        33
-Release:        2%{?dist}
+Version:        34
+Release:        1%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
 Source2:        usercustomize.py
 Source3:        org.fedoraproject.Platform.appdata.xml
 Source4:        org.fedoraproject.Sdk.appdata.xml
+Source5:        defaults.json.in
 
 License:        MIT
 
@@ -41,6 +42,14 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
 install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE3}
 install -t $RPM_BUILD_ROOT%{_datadir}/metainfo -p -m 0644 %{SOURCE4}
 
+# Install flatpak-builder config file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder
+sed -e 's|%%{_libdir}|%{_libdir}|' \
+    -e 's|%%{build_cflags}|%{build_cflags}|' \
+    -e 's|%%{build_cxxflags}|%{build_cxxflags}|' \
+    -e 's|%%{build_ldflags}|%{build_ldflags}|' \
+    %{SOURCE5} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json
+
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf
 
@@ -71,10 +80,14 @@ HOME=/root /usr/bin/fc-cache -s
 %dir %{_prefix}/cache/fontconfig
 %{python3_sitelib}
 %{_datadir}/metainfo/*.appdata.xml
+%{_sysconfdir}/flatpak-builder/
 %{_sysconfdir}/fonts/conf.d/*
 %{_sysconfdir}/ld.so.conf.d/app.conf
 
 %changelog
+* Tue Feb 02 2021 Kalev Lember <klember@redhat.com> - 34-1
+- Install flatpak-builder defaults.json config file
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 33-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

                 reply	other threads:[~2026-09-10 21:21 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=178907530612.1.17101052779269735845.rpms-flatpak-runtime-config-23a68b312c6f@fedoraproject.org \
    --to=klember@redhat.com \
    --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