Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package meld for openSUSE:Factory checked in 
at 2022-08-27 11:50:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/meld (Old)
 and      /work/SRC/openSUSE:Factory/.meld.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "meld"

Sat Aug 27 11:50:27 2022 rev:79 rq:999500 version:3.21.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/meld/meld.changes        2022-08-23 
14:27:15.163306149 +0200
+++ /work/SRC/openSUSE:Factory/.meld.new.2083/meld.changes      2022-08-27 
11:50:28.341892347 +0200
@@ -1,0 +2,8 @@
+Thu Aug 25 20:03:43 UTC 2022 - Antoine Belvire <antoine.belv...@opensuse.org>
+
+- Add meld-3.21.3-fix-executable-permission.patch: Restore
+  executable permission of application.
+- Don't strip env from shebang line in %prep: It's performed via
+  meson since 3.21.3.
+
+-------------------------------------------------------------------

New:
----
  meld-3.21.3-fix-executable-permission.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ meld.spec ++++++
--- /var/tmp/diff_new_pack.moJkMx/_old  2022-08-27 11:50:28.909893567 +0200
+++ /var/tmp/diff_new_pack.moJkMx/_new  2022-08-27 11:50:28.913893576 +0200
@@ -24,6 +24,8 @@
 Group:          Development/Tools/Other
 URL:            http://meldmerge.org/
 Source0:        
https://download.gnome.org/sources/meld/3.21/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM meld-3.21.3-fix-executable-permission.patch -- Fix 
missing executable permission 
+Patch0:         meld-3.21.3-fix-executable-permission.patch
 
 BuildRequires:  appstream-glib
 BuildRequires:  desktop-file-utils
@@ -70,7 +72,6 @@
 
 %prep
 %autosetup -p1
-sed -i "s|/usr/bin/env python3|%{_bindir}/python3|g" bin/meld
 
 %build
 %meson

++++++ meld-3.21.3-fix-executable-permission.patch ++++++
>From 710972cf25b5b677f862e781b7e058ef828c3cd4 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willad...@gmail.com>
Date: Fri, 19 Aug 2022 07:41:25 +1000
Subject: [PATCH] Fix shebang normalisation to maintain script mode

---
 meson_shebang_normalisation.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meson_shebang_normalisation.py b/meson_shebang_normalisation.py
index 4cf18754..e126d8fb 100755
--- a/meson_shebang_normalisation.py
+++ b/meson_shebang_normalisation.py
@@ -15,6 +15,9 @@ def main():
     lines[0] = "".join(lines[0].split("env "))
     out_path.write_text("".join(lines))
 
+    stat = in_path.stat()
+    out_path.chmod(stat.st_mode)
+
 
 if __name__ == "__main__":
     main()
-- 
GitLab

Reply via email to