[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source

[Michael Meeks]

 scp2/source/onlineupdate/file_onlineupdate.scp |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d66344d7c79d698317194b19ccbb951844954c81
Author: Andras Timar <atimar at suse.com>
Date:   Tue Mar 6 21:46:12 2012 +0100

    fdo#46508 use ISCHECKFORPRODUCTUPDATES property for online update
    
    ISCHECKFORPRODUCTUPDATES is a de-facto standard for enabling or
    disabling Online Update feature. We had this property but it was
    unused for a long time. Now LibreOffice can be installed with
    msiexec /i LibO<version>.msi ISCHECKFORPRODUCTUPDATES=0 in order
    to disable Online Update feature.
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 07ab650..8cca574 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -27,13 +27,20 @@
 
 #include "macros.inc"
 
-SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updchk , updchk.uno )
+File gid_File_Lib_Updchk
+    BIN_FILE_BODY;
+	Styles = (PACKED);
+	Dir = gid_Brand_Dir_Program;
+	Name = "updchk.uno.dll";
+    ComponentCondition="ISCHECKFORPRODUCTUPDATES=1";
+End 
 
 File gid_File_Share_Registry_Onlineupdate_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Brand_Dir_Share_Registry;
     Name = "onlineupdate.xcd";
+    ComponentCondition="ISCHECKFORPRODUCTUPDATES=1";
 End
 
 #if defined LINUX || defined SOLARIS