[virt-tools-list] [PATCH virt-viewer 2/4] nsis: update required files and libraries

[Marc-André Lureau]

---
 data/virt-viewer.nsis.in |   46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in
index e438159..f221a20 100644
--- a/data/virt-viewer.nsis.in
+++ b/data/virt-viewer.nsis.in
@@ -66,6 +66,7 @@ Section "VirtViewer"
   File "@prefix@/bin/libcairo-2.dll"
   File "@prefix@/bin/libcelt051-0.dll"
   File "@prefix@/bin/libcrypto-10.dll"
+  File "@prefix@/bin/libexpat-1.dll"
   File "@prefix@/bin/libffi-6.dll"
   File "@prefix@/bin/libfontconfig-1.dll"
   File "@prefix@/bin/libfreetype-6.dll"
@@ -99,8 +100,8 @@ Section "VirtViewer"
   File "@prefix@/bin/libpangowin32-1.0-0.dll"
   File "@prefix@/bin/libpixman-1-0.dll"
   File "@prefix@/bin/libpng15-15.dll"
-  File "@prefix@/bin/libspice-client-glib-2.0-1.dll"
-  File "@prefix@/bin/libspice-client-gtk-2.0-1.dll"
+  File "@prefix@/bin/libspice-client-glib-2.0-8.dll"
+  File "@prefix@/bin/libspice-client-gtk-2.0-4.dll"
   File "@prefix@/bin/libspice-controller-0.dll"
   File "@prefix@/bin/libssl-10.dll"
   File "@prefix@/bin/libtasn1-3.dll"
@@ -128,6 +129,7 @@ Section "VirtViewer"
   File /oname=remote-viewer.com "${DESTDIR}@prefix@/bin/windows-cmdline-wrapper.exe"
   File "${DESTDIR}@prefix@/bin/remote-viewer.exe"
   File "${DESTDIR}@prefix@/bin/virt-viewer.exe"
+  File "@prefix@/bin/readline.dll"
   File "@prefix@/bin/zlib1.dll"
 
   SetOutPath "$INSTDIR\etc"
@@ -212,15 +214,11 @@ Section "Uninstall"
   DeleteRegKey HKCU "${REG_UNINSTALL}"
   DeleteRegKey HKCU "${REG_IEPOLICY}"
 
-  RMDir /r "$INSTDIR\lib\pango"
-
-  RMDir /r "$INSTDIR\lib\gtk-2.0"
-
-  RMDir /r "$INSTDIR\share\icons\hicolor"
 
-  Delete /rebootok "$INSTDIR\share\virt-viewer\ui\*.xml"
-  Delete /rebootok "$INSTDIR\share\themes\MS-Windows\gtk-2.0\gtkrc"
+  RMDir /r "$INSTDIR\share"
 
+  RMDir /r "$INSTDIR\lib\pango"
+  RMDir /r "$INSTDIR\lib\gtk-2.0"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsrc.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsink.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstcoreelements.dll"
@@ -231,18 +229,19 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioconvert.dll"
   Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstapp.dll"
   RMDir "$INSTDIR\lib\gstreamer-0.10"
-
   RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
 
   RMDir /r "$INSTDIR\etc\pango"
-
   RMDir /r "$INSTDIR\etc\gtk-2.0"
-
   RMDir /r "$INSTDIR\etc\fonts"
 
   Delete /rebootok "$INSTDIR\bin\remote-viewer.com"
   Delete /rebootok "$INSTDIR\bin\remote-viewer.exe"
+  Delete /rebootok "$INSTDIR\bin\virt-viewer.exe"
+  Delete /rebootok "$INSTDIR\bin\virsh.exe"
   Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe"
+  Delete /rebootok "$INSTDIR\bin\virt-pki-validate"
+  Delete /rebootok "$INSTDIR\bin\virt-xml-validate"
   Delete /rebootok "$INSTDIR\bin\libpangoft2-1.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
@@ -258,16 +257,15 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\gst-inspect-0.10.exe"
   Delete /rebootok "$INSTDIR\bin\gst-feedback.exe"
   Delete /rebootok "$INSTDIR\bin\gst-discoverer-0.10.exe"
-  RMDir "$INSTDIR\bin"
-
-  Delete /rebootok "$INSTDIR\bin\libffi-6.dll"
   Delete /rebootok "$INSTDIR\bin\zlib1.dll"
+  Delete /rebootok "$INSTDIR\bin\readline.dll"
+  Delete /rebootok "$INSTDIR\bin\libffi-6.dll"
   Delete /rebootok "$INSTDIR\bin\libp11-kit-0.dll"
   Delete /rebootok "$INSTDIR\bin\libxml2-2.dll"
   Delete /rebootok "$INSTDIR\bin\libtasn1-3.dll"
   Delete /rebootok "$INSTDIR\bin\libssl-10.dll"
-  Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-1.dll"
-  Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-1.dll"
+  Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll"
+  Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll"
   Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll"
   Delete /rebootok "$INSTDIR\bin\libpng15-15.dll"
   Delete /rebootok "$INSTDIR\bin\libpixman-1-0.dll"
@@ -278,6 +276,16 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\liborc-0.4-0.dll"
   Delete /rebootok "$INSTDIR\bin\libjpeg-62.dll"
   Delete /rebootok "$INSTDIR\bin\libintl-8.dll"
+  Delete /rebootok "$INSTDIR\bin\libvirt-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libcurl-4.dll"
+  Delete /rebootok "$INSTDIR\bin\libidn-11.dll"
+  Delete /rebootok "$INSTDIR\bin\libssh2-1.dll"
+  Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libportablexdr-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libvirt-qemu-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libssp-0.dll"
   Delete /rebootok "$INSTDIR\bin\iconv.dll"
   Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll"
@@ -291,6 +299,8 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\libgstaudio-0.10-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgstapp-0.10-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll"
+  Delete /rebootok "$INSTDIR\bin\libgnutls-26.dll"
+  Delete /rebootok "$INSTDIR\bin\libgcrypt-11.dll"
   Delete /rebootok "$INSTDIR\bin\libgmodule-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libglib-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libgio-2.0-0.dll"
@@ -298,11 +308,13 @@ Section "Uninstall"
   Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
   Delete /rebootok "$INSTDIR\bin\libfreetype-6.dll"
   Delete /rebootok "$INSTDIR\bin\libfontconfig-1.dll"
+  Delete /rebootok "$INSTDIR\bin\libexpat-1.dll"
   Delete /rebootok "$INSTDIR\bin\libcrypto-10.dll"
   Delete /rebootok "$INSTDIR\bin\libcelt051-0.dll"
   Delete /rebootok "$INSTDIR\bin\libcairo-2.dll"
   Delete /rebootok "$INSTDIR\bin\libatk-1.0-0.dll"
   RMDir "$INSTDIR\bin"
+  RMDir "$INSTDIR\lib"
   RMDir "$INSTDIR"
 SectionEnd
 
-- 
1.7.10.4