Fix FTBFS. rhbz#2046759

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-01-29 16:22:53 +04:00
parent 43cc341a60
commit 57aeebd4e3
3 changed files with 2667 additions and 31 deletions

2662
0001-Update-data-wixl.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,29 +0,0 @@
From 7a41039f7a812d176c733fc06d5e7646469f9f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Sun, 1 Aug 2021 19:47:14 +0400
Subject: [PATCH] wxi: update libffi
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
data/wixl/libffi.wxi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/wixl/libffi.wxi b/data/wixl/libffi.wxi
index c7e75e3..3b0cf53 100644
--- a/data/wixl/libffi.wxi
+++ b/data/wixl/libffi.wxi
@@ -5,7 +5,7 @@
<DirectoryRef Id="INSTALLDIR">
<Directory Id="dirB37BA35DC0E52FA4D62B8457EA52998D" Name="bin">
<Component Win64="$(var.Win64)" Id="cmp4F67E190AA41922A005AF2B11F7D98C7" Guid="*">
- <File Id="fil3C28FBAFB6D0436D0420107C1F59E022" KeyPath="yes" Source="$(var.SourceDir)/bin/libffi-6.dll"/>
+ <File Id="fil3C28FBAFB6D0436D0420107C1F59E022" KeyPath="yes" Source="$(var.SourceDir)/bin/libffi-8.dll"/>
</Component>
</Directory>
</DirectoryRef>
--
2.32.0.264.g75ae10bc75

View File

@ -12,13 +12,13 @@
Name: msitools
Version: 0.101.32
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Windows Installer tools
License: GPLv2+
URL: http://ftp.gnome.org/pub/GNOME/sources/%{name}
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}%{?_version_suffix}.tar.xz
Patch0: 0001-wxi-update-libffi.patch
Patch0: 0001-Update-data-wixl.patch
Requires: libgsf >= 1.14.24-2
@ -274,6 +274,9 @@ The libmsi1-devel package includes the header files for libmsi.
%changelog
* Sat Jan 29 2022 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.101.32-3
- Fix FTBFS. rhbz#2046759
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.101.32-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild