mise à jour en 2.5.1 (et passage en MSI pour l'installation)

packages/tightvnc.xml

@@ -2,16 +2,17 @@
 <packages>
     <package id="tightvnc" 
              name="Serveur VNC TightVNC"
-             revision="4" 
+             revision="5" 
              priority="10" 
              reboot="false">
  
-        <variable name="PKG_VERSION" value="2.0.4" />
+        <variable name="PKG_VERSION" value="2.5.1" />
 
-        <variable architecture="x86" name="INSTALL_PATH" value="%PROGRAMFILES%\TightVNC" />
+        <variable architecture="x86" name="MSI" value="%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-setup-32bit.msi" />
-        <variable architecture="x64" name="INSTALL_PATH" value="%PROGRAMFILES(x86)%\TightVNC" />
+        <variable architecture="x64" name="MSI" value="%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-setup-64bit.msi" />
         <variable architecture="x86" name="REG_PATH" value="%SETTINGS%\tightvnc\tightvnc_x86.reg" />
         <variable architecture="x64" name="REG_PATH" value="%SETTINGS%\tightvnc\tightvnc_x64.reg" />
+        <variable name="INSTALL_PATH" value="%PROGRAMFILES%\TightVNC" />
 
         <check type="uninstall" condition="exists" path="TightVNC %PKG_VERSION%" />
 
@@ -19,7 +20,7 @@
         <install cmd='%COMSPEC% /C if exist "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" /SP- /VERYSILENT /NORESTART' />
 
         <!-- Install TightVNC -->
-        <install cmd='"%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-setup.exe" /S' />
+        <install cmd='msiexec /qn /norestart /i "%MSI%"' />
         <!-- Install the TightVNC Server as a service -->
         <install cmd='"%INSTALL_PATH%\tvnserver" -install -silent' >
             <exit code="1" />
@@ -37,7 +38,7 @@
 
         <!-- Remove RealVNC if installed -->
         <upgrade cmd='%COMSPEC% /C if exist "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" "%PROGRAMFILES%\RealVNC\VNC4\unins000.exe" /SP- /VERYSILENT /NORESTART' />
-        <upgrade cmd='"%SOFTWARE%\tightvnc\tightvnc-%PKG_VERSION%-setup.exe" /S' />
+        <upgrade cmd='msiexec /qn /norestart /i "%MSI%"' />
         <upgrade cmd='"%INSTALL_PATH%\tvnserver" -reinstall -silent' />
         <upgrade cmd='"%INSTALL_PATH%\tvnserver" -stop -silent' >
             <exit code="1" />
@@ -46,11 +47,6 @@
         <upgrade cmd='%COMSPEC% /C regedit /s "%REG_PATH%"' />
         <upgrade cmd='"%INSTALL_PATH%\tvnserver" -start -silent' />
 
-        <remove cmd='%COMSPEC% /C "%INSTALL_PATH%\uninstall.exe" /S' />
+        <remove cmd='msiexec /qn /norestart /x "%MSI%"' />
-        <!-- Uninstall returns immediatly, so just wait a few seconds for it to remove before checking the status again
-             Unfortunatly, WINDOWS has no sleep commands -->
-        <remove cmd='%COMSPEC% /C ping -n 5 127.0.0.1 1>NUL 2>NUL' >
-            <exit code="any" />
-        </remove>
     </package>
 </packages>

wpkg-tightvnc.spec

@@ -1,6 +1,6 @@
 %define package tightvnc
 %define version 0.1
-%define realversion 2.0.4
+%define realversion 2.5.1
 %define release 0.beta1
 
 Name:		wpkg-%{package}
@@ -49,6 +49,9 @@ cp -r packages/* %{buildroot}/home/e-smith/files/shares/wpkg/files/packages/
 /bin/rm -rf %{buildroot}
 
 %changelog
+* Wed Jun 6 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1+2.5.1
+- update to 2.5.1
+
 * Mon Jun 4 2012 Daniel Berteaud <daniel@firewall-services.com> 0.1+2.0.4
 - initial release with TightVNC 2.0.4