diff --git a/0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch b/0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch new file mode 100644 index 0000000..b5178a8 --- /dev/null +++ b/0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch @@ -0,0 +1,36 @@ +From 03da0f1ed92cfe61bffbebda824c0900865e5eab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= +Date: Wed, 3 Apr 2013 13:49:32 +0200 +Subject: [PATCH] glib2.wxi: add a GLIB_ARCH to workaround #697156 + +--- + data/wixl/glib2.wxi | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/data/wixl/glib2.wxi b/data/wixl/glib2.wxi +index ead91b1..0d2058e 100644 +--- a/data/wixl/glib2.wxi ++++ b/data/wixl/glib2.wxi +@@ -35,12 +35,17 @@ + + + ++ ++ + +- ++ + + +- ++ + ++ + + + +-- +1.8.1.1.439.g50a6b54 + diff --git a/msitools.spec b/msitools.spec index 9e3c43c..ba8f55f 100644 --- a/msitools.spec +++ b/msitools.spec @@ -1,6 +1,6 @@ Name: msitools Version: 0.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Windows Installer tools License: GPLv2+ @@ -17,6 +17,8 @@ BuildRequires: libgsf-devel BuildRequires: libuuid-devel BuildRequires: vala-tools +Patch1: 0001-glib2.wxi-add-a-GLIB_ARCH-to-workaround-697156.patch + %description msitools is a collection of utilities to inspect and create Windows Installer files. It is useful in a cross-compilation environment such @@ -40,7 +42,7 @@ The libmsi1-devel package includes the header files for libmsi. %prep %setup -q - +%patch1 -p1 %build %configure --enable-fast-install @@ -84,6 +86,9 @@ rm -f %{buildroot}%{_libdir}/*.la %changelog +* Wed Apr 3 2013 Marc-André Lureau - 0.92-2 +- Add a glib.wxi workaround for win64 + * Thu Mar 7 2013 Marc-André Lureau - 0.92-1 - New upstream release. - Add msidump & msidiff tools.