public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/7zip] epel10: Respect %_prefix
@ 2026-06-15 18:21 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-06-15 18:21 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/7zip
            Branch : epel10
            Commit : 97e37af60bde0470561f02e257e42f7feb2c619f
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-02-10T22:40:32-05:00
            Stats  : +4/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/7zip/c/97e37af60bde0470561f02e257e42f7feb2c619f?branch=epel10

            Log:
            Respect %_prefix

For example, when built for flatpaks, the /app prefix is used.

---
diff --git a/7zip-find-so-in-libexec.diff b/7zip-find-so-in-libexec.diff
index f63e141..bcb6845 100644
--- a/7zip-find-so-in-libexec.diff
+++ b/7zip-find-so-in-libexec.diff
@@ -8,8 +8,8 @@ index 7fe18fb..4b79e2d 100644
    s = fas2fs(g_ModuleDirPrefix);
 -  if (s.IsEmpty())
 -    s = FTEXT(".") FSTRING_PATH_SEPARATOR;
-+  if (s.IsEmpty() || s.IsPrefixedBy("/usr/bin"))
-+    s = FTEXT("/usr/libexec/7zip") FSTRING_PATH_SEPARATOR;
++  if (s.IsEmpty() || s.IsPrefixedBy("__Z7_PREFIX__/bin"))
++    s = FTEXT("__Z7_PREFIX__/libexec/7zip") FSTRING_PATH_SEPARATOR;
    return s;
    /*
    setenv("_7ZIP_HOME_DIR", "/test/", 0);

diff --git a/7zip.spec b/7zip.spec
index 53cfad2..873a7dc 100644
--- a/7zip.spec
+++ b/7zip.spec
@@ -80,6 +80,8 @@ Summary:        Standalone version of 7-Zip console that supports all formats
 
 # avoid failures due to new warnings in latest GCC
 sed -i -e 's|-Werror||' CPP/7zip/7zip_gcc.mak
+# from 7zip-find-so-in-libexec.diff
+sed -i -e 's|__Z7_PREFIX__|%{_prefix}|g' CPP/7zip/UI/Common/ArchiveCommandLine.cpp
 
 
 %build

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-15 18:21 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-15 18:21 [rpms/7zip] epel10: Respect %_prefix Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox