2009-01-29 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 29 Jan 2009 15:35:26 +0000 (15:35 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 29 Jan 2009 15:35:26 +0000 (15:35 +0000)
* src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: Be relaxed
about dbus-daemon and dependencies.

ChangeLog
src/inst-kdesupport.nsi
src/uninst-kdesupport.nsi

index 3ba1390..24e86ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-29  Marcus Brinkmann  <marcus@g10code.de>
+
+       * src/inst-kdesupport.nsi, src/uninst-kdesupport.nsi: Be relaxed
+       about dbus-daemon and dependencies.
+
 2009-01-28  Werner Koch  <wk@g10code.com>
 
        * packages/packages.current: Update gpgol and gpgex.
index dbcc297..5f49c17 100644 (file)
@@ -34,7 +34,13 @@ Section "-kdesupport" SEC_kdesupport
 !else
   # FIXME: Figure out how to relocate dbus-daemon (and kleopatra).
   SetOutPath "$INSTDIR\bin"
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/bin/dbus-daemon.exe
+  SetOverwrite lastused
+  IfErrors 0 +3
+      File /oname=dbus-daemon.exe.tmp ${prefix}/bin/dbus-daemon.exe
+      Rename /REBOOTOK dbus-daemon.exe.tmp dbus-daemon.exe
   SetOutPath "$INSTDIR"
 
   File ${prefix}/bin/dbus-launch.exe
@@ -53,8 +59,23 @@ Section "-kdesupport" SEC_kdesupport
 
   SetOutPath "$INSTDIR"
   File ${prefix}/bin/giflib4.dll
+
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/bin/libdbus-1.dll
+  SetOverwrite lastused
+  IfErrors 0 +3
+      File /oname=libdbus-1.dll.tmp ${prefix}/bin/libdbus-1.dll
+      Rename /REBOOTOK libdbus-1.dll.tmp libdbus-1.dll
+
+  ClearErrors
+  SetOverwrite try
   File ${prefix}/bin/libexpat.dll
+  SetOverwrite lastused
+  IfErrors 0 +3
+      File /oname=libexpat.dll.tmp ${prefix}/bin/libexpat.dll
+      Rename /REBOOTOK libexpat.dll.tmp libexpat.dll
+
   File ${prefix}/bin/libexpatw.dll
   File ${prefix}/bin/libexslt.dll
   File ${prefix}/bin/libkdewin32.dll
index 774077d..3ccbd1a 100644 (file)
@@ -31,7 +31,7 @@ Section "-un.kdesupport"
   Call un.SourceDelete
 !else
   # FIXME: See inst-kdesupport.nsi.
-  Delete "$INSTDIR\bin\dbus-daemon.exe"
+  Delete /REBOOTOK "$INSTDIR\bin\dbus-daemon.exe"
   RMDir "$INSTDIR\bin"
 
   Delete "$INSTDIR\dbus-env.bat"
@@ -45,8 +45,10 @@ Section "-un.kdesupport"
   Delete "$INSTDIR\xsltproc.exe"
 
   Delete "$INSTDIR\giflib4.dll"
-  Delete "$INSTDIR\libdbus-1.dll"
-  Delete "$INSTDIR\libexpat.dll"
+  # We can not force down dbus-daemon, because it may be in use by
+  # non-gpg4win components (like KoWi).
+  Delete /REBOOTOK "$INSTDIR\libdbus-1.dll"
+  Delete /REBOOTOK "$INSTDIR\libexpat.dll"
   Delete "$INSTDIR\libexpatw.dll"
   Delete "$INSTDIR\libexslt.dll"
   Delete "$INSTDIR\libkdewin32.dll"