From 3b96b30fce7e570e2be5cdc7472dd11daa5210a0 Mon Sep 17 00:00:00 2001
From: Adam Thorn <alt36@cam.ac.uk>
Date: Wed, 11 Jan 2017 11:52:24 +0000
Subject: [PATCH] Acrobat Reader DC -> v15.023.20053

Tidied up the XML: we don't need to apply each and every patch, as
just the lastest one is sufficient.
---
 acrobatreaderdc.xml | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/acrobatreaderdc.xml b/acrobatreaderdc.xml
index 623413b9..b610eb62 100644
--- a/acrobatreaderdc.xml
+++ b/acrobatreaderdc.xml
@@ -4,43 +4,22 @@
   revision="%version%.1"
   priority="50">
 
-  <variable name="version" value="15.020.20042" />
-
+  <variable name="version" value="15.023.20053" />
+  <variable name="patchversion" value="1502320053" />
   <check type="uninstall" condition="versiongreaterorequal" path="Adobe Acrobat Reader DC" value="%version%" />
 
+  <!-- patches are cumulative; we only need to apply the latest one -->
   <install cmd='msiexec /qn /i "%SOFTWARE%\Adobe\AcrobatReaderDC\1500920069\AcroRead.msi" /l* c:\netinst\logs\ReaderDC.log TRANSFORMS="%SOFTWARE%\Adobe\AcrobatReaderDC\1500920069\Chemistry.mst"'>
     <exit code="0" />
     <exit code="3010" reboot="false" />
   </install>
-  <install cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd1500920077.msp"'>
-    <exit code="0" />
-    <exit code="3010" reboot="false" />
-  </install>
-  <install cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd1500920079.msp"'>
-    <exit code="0" />
-    <exit code="3010" reboot="false" />
-  </install>
-  <install cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd1501620045.msp"'>
-    <exit code="0" />
-    <exit code="3010" reboot="false" />
-  </install>
-  <install cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd1501720050.msp"'>
-    <exit code="3010" reboot="false" />
-  </install>
-  <install cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd1501720053.msp"'>
-    <exit code="3010" reboot="false" />
-  </install>
-  <install cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd1502020039.msp"'>
-    <exit code="3010" reboot="false" />
-  </install>
-  <install cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd1502020042.msp"'>
+  <install cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd%patchversion%.msp"'>
     <exit code="3010" reboot="false" />
   </install>
 
-  <upgrade cmd='msiexec /qn /l* c:\netinst\logs\ReaderDC-p1.log /update "%SOFTWARE%\Adobe\AcrobatReaderDC\AcroRdrDCUpd1502020042.msp"'>
-    <exit code="3010" reboot="false" />
-  </upgrade>
+  <upgrade include='install' />
 
+  <!-- GUID seems to be stable between patchversions -->
   <remove cmd='msiexec /qn /x {AC76BA86-7AD7-1033-7B44-AC0F074E4100}'>
     <exit code='1605'/>
   </remove>
-- 
GitLab