[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - scp2/source

[Andras Timar]

 scp2/source/ooo/vc_redist.scp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b5931a228e8a61f32f8b6249844c486ef9eb501c
Author: Andras Timar <atimar at suse.com>
Date:   Tue Apr 23 14:51:02 2013 +0200

    do not install 64-bit MSVCRT on 32-bit Windows
    
    Change-Id: I73a97ecc3021e00071297ed5fa403cf349f0a9fe

diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index fa7d1c2..283ba9c 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64
     Feature = gm_Root;
     Name = "Microsoft_VC100_CRT_x64.msm";
     RootDir = "TARGETDIR";
-    ComponentCondition = "VC_REDIST=1";
+    ComponentCondition = "(VC_REDIST=1) AND VersionNT64";
 End
 
 #endif
@@ -104,7 +104,7 @@ MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64
     Feature = gm_Root;
     Name = "Microsoft_VC110_CRT_x64.msm";
     RootDir = "TARGETDIR";
-    ComponentCondition = "VC_REDIST=1";
+    ComponentCondition = "(VC_REDIST=1) AND VersionNT64";
 End
 
 #endif