commit 8e28d001cb795bcb047a774b44fa6cfa9d8d1dab
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date:   Tue Jun 20 19:42:25 2023 +0200

    - updated to 0.102

 msitools-wixl-headers.patch | 26 --------------------------
 msitools.spec               |  8 ++++----
 2 files changed, 4 insertions(+), 30 deletions(-)
---
diff --git a/msitools.spec b/msitools.spec
index c4ad202..e6faa63 100644
--- a/msitools.spec
+++ b/msitools.spec
@@ -6,13 +6,12 @@
 Summary:       MSI manipulation library and tools
 Summary(pl.UTF-8):     Biblioteka i narzędzia do obróbki plików MSI
 Name:          msitools
-Version:       0.101
+Version:       0.102
 Release:       1
 License:       LGPL v2.1+
 Group:         Applications/File
 Source0:       
https://download.gnome.org/sources/msitools/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: ab3cfee1b8b7bdf805e93f0cfd2c2031
-Patch0:                %{name}-wixl-headers.patch
+# Source0-md5: c773d25de403fefa896613ab26b59c84
 URL:           https://wiki.gnome.org/msitools
 BuildRequires: bison
 BuildRequires: gcab-devel >= 0.1.10
@@ -101,12 +100,13 @@ Bashowe dopełnianie poleceń dla narzędzi MSI (msiinfo 
oraz msibuild).
 
 %prep
 %setup -q
-%patch0 -p1
 
 %if %{with static_libs}
 %{__sed} -i '/^libmsi =/ s/shared_library/library/' libmsi/meson.build
 %endif
 
+%{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' tools/{msidiff,msidump}.in
+
 %build
 %meson build
 
diff --git a/msitools-wixl-headers.patch b/msitools-wixl-headers.patch
deleted file mode 100644
index 4c800e7..0000000
--- a/msitools-wixl-headers.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit b08275d549bb12a09a420ef9ccaeb0974e00008a
-Author: Stephen Kitt <st...@sk2.org>
-Date:   Sat Feb 6 22:57:52 2021 +0100
-
-    Stop using a header for wixl-heat
-    
-    Having wixl and wixl-heat use the same header means that, if wixl-heat
-    is built after wixl, anything relying on the full wixl.h subsequently
-    will fail. wixl-heat doesn't need a header, so we can stop using it.
-    
-    Fixes: #31
-    Signed-off-by: Stephen Kitt <st...@sk2.org>
-
-diff --git a/tools/wixl/meson.build b/tools/wixl/meson.build
-index bcce524..8a056fa 100644
---- a/tools/wixl/meson.build
-+++ b/tools/wixl/meson.build
-@@ -47,8 +47,6 @@ wixl_heat = executable('wixl-heat',
-   'wixl-heat.vala',
-   config_h,
-   vala_args: [
--    '-H', 'wixl.h',
--    '--use-header',
-     '--enable-experimental',
-     '--pkg', 'config',
-     '--pkg', 'posix',
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/msitools.git/commitdiff/8e28d001cb795bcb047a774b44fa6cfa9d8d1dab

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to