Fix version number in scp2-generated version ini-file UpdateID variable

USERDIRPRODUCTVERSION is stuck at 4 now (as its main use is for the version
number of the UserInstallation directory), so use LIBO_VERSION_MAJOR instead
(like generation of the version ini-file counterpart for instdir/ does in
instsetoo_native/CustomTarget_setup.mk).

Change-Id: Ib87536d335487383940cff2f69c864a33f05bbee
Reviewed-on: https://gerrit.libreoffice.org/35301Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

instsetoo_native/util/openoffice.lst.in

@@ -4,6 +4,7 @@ Globals
     {
         variables
         {
+            LIBO_VERSION_MAJOR @LIBO_VERSION_MAJOR@
             UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             URELAYERVERSION 1
             REFERENCEOOOMAJORMINOR 4.1

solenv/bin/modules/installer/scriptitems.pm

@@ -632,8 +632,8 @@ sub replace_setup_variables
 
     my $productname = $hashref->{'PRODUCTNAME'};
     my $productversion = $hashref->{'PRODUCTVERSION'};
-    my $userdirproductversion = "";
-    if ( $hashref->{'USERDIRPRODUCTVERSION'} ) { $userdirproductversion = $hashref->{'USERDIRPRODUCTVERSION'}; }
+    my $libo_version_major = "";
+    if ( $hashref->{'LIBO_VERSION_MAJOR'} ) { $libo_version_major = $hashref->{'LIBO_VERSION_MAJOR'}; }
     my $productkey = $productname . " " . $productversion;
 
     # string $buildid, which is used to replace the setup variable <buildid>
@@ -653,7 +653,7 @@ sub replace_setup_variables
 
     if ( $localminor =~ /^\s*\w(\d+)\w*\s*$/ ) { $localminor = $1; }
 
-    my $updateid = $productname . "_" . $userdirproductversion . "_" . $$languagestringref;
+    my $updateid = $productname . "_" . $libo_version_major . "_" . $$languagestringref;
     $updateid =~ s/ /_/g;
 
     for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )