From 57f79c190f72ef64434ec48f851584f12778d5d0 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 1 Feb 2018 11:14:52 +0100
Subject: [PATCH] Remove x86 variant of 5.3.7 if installed

---
 packages/libreoffice.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/libreoffice.xml b/packages/libreoffice.xml
index 53978a5..05b7f12 100755
--- a/packages/libreoffice.xml
+++ b/packages/libreoffice.xml
@@ -11,9 +11,13 @@
 	<variable architecture="x86" name="MSI" value="%SOFTWARE%\libreoffice\LibreOffice_%PKG_VERSION%_Win_x86.msi" />
  
         <check type="uninstall" condition="versiongreaterorequal" path="LibreOffice .+" value="%PKG_VERSION%" />
- 
+	
         <install cmd='msiexec /qn /i "%MSI%" ISCHECKFORPRODUCTUPDATE=0 CREATEDESKTOPLINK=0 REGISTER_NO_MSO_TYPES=1 RebootYesNo=No UI_LANGS=en_US,fr' />
 
+	<!-- Remove x86 5.3.7 -->
+	<upgrade architecture="x64" cmd="msiexec /qn /norestart /x{6F962302-C743-44AF-9E32-2817BF2BB874}">
+          <exit code='any' />
+        </upgrade>
         <upgrade include="install" />
 
         <remove cmd='msiexec /qn /norestart /x "%MSI%"' />