[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - instsetoo_native/inc_openoffice solenv/bin

[Mike Kaganski]

 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |    2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt |    2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |    1 +
 solenv/bin/modules/installer/windows/property.pm                   |    4 +++-
 4 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 158f6e5489d8167299deb53fde433e835019d10a
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Mon Apr 9 09:33:20 2018 +0100

    tdf#108580 related: Check for SP level of the minimal supported OS
    
    Currently we support Win7 SP1 and later; so let installer fail on lower SP levels.
    
    Change-Id: I807e0a04870b9eeabbfae258d68da4a1156b0408
    Reviewed-on: https://gerrit.libreoffice.org/52619
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 79383148bb31bee0c8fae941f6cc0fdd605fb2ea)
    Reviewed-on: https://gerrit.libreoffice.org/52632
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 680961b4f744..303202c31f5f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -71,4 +71,4 @@ ValidateProductID		300
 WriteEnvironmentStrings		2500
 WriteIniValues		2450
 WriteRegistryValues		2400
-WrongWindowsVersion	VersionNT < WindowsMinVersionNumber	10
+WrongWindowsVersion	(VersionNT < WindowsMinVersionNumber) OR ((VersionNT = WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber))	10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
index 24642ecaeb74..9a507df4175f 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
@@ -28,4 +28,4 @@ SetupProgress		800
 SetupResume	Installed And (RESUME Or Preselected) And Not PATCH	700
 setUserProfile		510
 ValidateProductID		350
-WrongWindowsVersion	VersionNT < WindowsMinVersionNumber	10
+WrongWindowsVersion	(VersionNT < WindowsMinVersionNumber) OR ((VersionNT = WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber))	10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index b16732079076..f8eeaf25c105 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -64,3 +64,4 @@ UpgradeCode	UPGRADECODETEMPLATE
 VC_REDIST	1
 WindowsMinVersionText	WINDOWSMINVERSIONTEXTTEMPLATE
 WindowsMinVersionNumber	WINDOWSMINVERSIONNUMBERTEMPLATE
+WindowsMinSPNumber	WINDOWSMINSPNUMBERTEMPLATE
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 61b18ac29a56..a0ad3698aa10 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -419,8 +419,9 @@ sub update_property_table
     my $productname = get_productname_for_property_table($language, $allvariables);
     my $productversion = get_productversion_for_property_table();
     my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($language, $allvariables);
-    my $windowsminversiontext = "Windows 7";
+    my $windowsminversiontext = "Windows 7 SP1";
     my $windowsminversionnumber = "601";
+    my $windowsminspnumber = "1";
 
     # Updating the values
 
@@ -436,6 +437,7 @@ sub update_property_table
         ${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
         ${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONTEXTTEMPLATE\b/$windowsminversiontext/;
         ${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONNUMBERTEMPLATE\b/$windowsminversionnumber/;
+        ${$propertyfile}[$i] =~ s/\bWINDOWSMINSPNUMBERTEMPLATE\b/$windowsminspnumber/;
         if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = 1; }
     }