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: Revert "Fix search paths for /app-installed python modules" (#2026979)
Date: Thu, 10 Sep 2026 21:21:49 GMT	[thread overview]
Message-ID: <178907530942.1.16875503575884734781.rpms-flatpak-runtime-config-5895a480a348@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/flatpak-runtime-config
            Branch : f45
            Commit : 5895a480a348cc34f4ea6c70fdeb326e157b3619
            Author : Kalev Lember <klember@redhat.com>
            Date   : 2022-09-06T09:12:35+02:00
            Stats  : +6/-11 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/flatpak-runtime-config/c/5895a480a348cc34f4ea6c70fdeb326e157b3619?branch=f45

            Log:
            Revert "Fix search paths for /app-installed python modules" (#2026979)

The python path issue is now fixed so we can go back to using the
original code.

https://bugzilla.redhat.com/show_bug.cgi?id=2026979

This reverts commit 2a984132dcf6d65665a45a8ce4d17fcbfeb30615.

---
diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index c96f342..7dc530a 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -3,6 +3,7 @@ Version:        37
 Release:        2%{?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
@@ -31,17 +32,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE1}
 
 # usercustomize.py to set up Python paths
-mkdir -p $RPM_BUILD_ROOT%{python3_sitelib}
-cat > $RPM_BUILD_ROOT%{python3_sitelib}/usercustomize.py <<EOF
-import site
-
-%define _prefix /app
-site.addsitedir("%{python3_sitelib}")
-%if "%{python3_sitelib}" != "%{python3_sitearch}"
-site.addsitedir("%{python3_sitearch}")
-%endif
-%undefine _prefix
-EOF
+for d in %{python3_sitelib} ; do
+    mkdir -p $RPM_BUILD_ROOT/$d
+    install -t $RPM_BUILD_ROOT/$d -m 0644 %{SOURCE2}
+done
 
 # Install appdata for both the Platform and the Sdk
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
@@ -94,6 +88,7 @@ HOME=/root /usr/bin/fc-cache -s
 %changelog
 * Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 37-2
 - Correctly substitute /app/lib in flatpak-builder defaults.json ldflags
+- Revert "Fix search paths for /app-installed python modules" (#2026979)
 
 * Wed Aug 17 2022 Kalev Lember <klember@redhat.com> - 37-1
 - appdata: Add F37 versions

                 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=178907530942.1.16875503575884734781.rpms-flatpak-runtime-config-5895a480a348@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