Use version numbers without release service version suffix for Windows

CMakeLists.txt

@@ -16,8 +16,10 @@ set(KLEOPATRA_VERSION_MINOR "1")
 set(KLEOPATRA_VERSION_PATCH "16")
 
 set(kleopatra_version "${KLEOPATRA_VERSION_MAJOR}.${KLEOPATRA_VERSION_MINOR}.${KLEOPATRA_VERSION_PATCH}.${KDE_APPLICATIONS_COMPACT_VERSION}")
-# The following is for Windows. Keep in line with kleopatra_version.
-set(kleopatra_fileversion "${KLEOPATRA_VERSION_MAJOR},${KLEOPATRA_VERSION_MINOR},${KLEOPATRA_VERSION_PATCH},0")
+# The following is for Windows
+set(kleopatra_version_win "${KLEOPATRA_VERSION_MAJOR}.${KLEOPATRA_VERSION_MINOR}.${KLEOPATRA_VERSION_PATCH}")
+set(kleopatra_fileversion_win "${KLEOPATRA_VERSION_MAJOR},${KLEOPATRA_VERSION_MINOR},${KLEOPATRA_VERSION_PATCH},0")
+
 project(kleopatra VERSION ${kleopatra_version})
 
 option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)

src/versioninfo.rc.in

@@ -12,8 +12,8 @@
 #include "afxres.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION @kleopatra_fileversion@
- PRODUCTVERSION @kleopatra_fileversion@
+ FILEVERSION @kleopatra_fileversion_win@
+ PRODUCTVERSION @kleopatra_fileversion_win@
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x20L
  FILEOS 0x40004L
@@ -27,14 +27,14 @@ BEGIN
             VALUE "Comments", "This program is available under the terms of the GNU General Public License, version 2 or any later version.\0"
             VALUE "CompanyName", "Gpg4win Initiative\0"
             VALUE "FileDescription", "Kleopatra - GnuPG User Interface\0"
-            VALUE "FileVersion", "@kleopatra_version@\0"
+            VALUE "FileVersion", "@kleopatra_version_win@\0"
             VALUE "InternalName", "kleopatra\0"
             VALUE "LegalCopyright", "Copyright 2010-2018 The Kleopatra developers\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "kleopatra.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Kleopatra\0"
-            VALUE "ProductVersion", "@kleopatra_version@\0"
+            VALUE "ProductVersion", "@kleopatra_version_win@\0"
             VALUE "SpecialBuild", "@Kleopatra_WC_LAST_CHANGED_DATE@\0"
         END
     END