[evolution/gnome-3-26] Show also git commit ID of Evolution in VERSION_SUBSTRING of flatpak build

[Milan Crha <mcrha src gnome org>]

commit 3c3f92285d0a200aae92cb941c225d93272144d6
Author: Milan Crha <mcrha redhat com>
Date:   Mon Sep 11 15:23:39 2017 +0200

    Show also git commit ID of Evolution in VERSION_SUBSTRING of flatpak build
    
    To easier identify which version of evolution had been used to build it.

 flatpak/org.gnome.Evolution-master.json |    9 ++++++++-
 flatpak/org.gnome.Evolution-stable.json |    9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/flatpak/org.gnome.Evolution-master.json b/flatpak/org.gnome.Evolution-master.json
index c032061..7dcfc87 100644
--- a/flatpak/org.gnome.Evolution-master.json
+++ b/flatpak/org.gnome.Evolution-master.json
@@ -271,7 +271,6 @@
                        "name": "evolution",
                        "buildsystem": "cmake",
                        "config-opts": [
-                               "-DVERSION_SUBSTRING:STRING=' (flatpak)'",
                                "-DENABLE_AUTOAR=OFF",
                                "-DENABLE_CONTACT_MAPS=OFF",
                                "-DENABLE_GNOME_DESKTOP=OFF",
@@ -296,6 +295,14 @@
                                },
 
                                {
+                                       "type": "shell",
+                                       "commands": [
+                                               "cp config.h.in config.h.in.orig",
+                                               "cat config.h.in.orig | sed -e \"s|\\@VERSION_SUBSTRING\\@| 
\\(flatpak git$(git log --pretty=format:%h HEAD^..HEAD)\\)|\" >config.h.in"
+                                       ]
+                               },
+
+                               {
                                        "type": "script",
                                        "commands": [
                                                "echo evolution-flatpak | /app/bin/gnome-keyring-daemon 
--daemonize --unlock &",
diff --git a/flatpak/org.gnome.Evolution-stable.json b/flatpak/org.gnome.Evolution-stable.json
index b484a6c..cb14cd0 100644
--- a/flatpak/org.gnome.Evolution-stable.json
+++ b/flatpak/org.gnome.Evolution-stable.json
@@ -270,7 +270,6 @@
                        "name": "evolution",
                        "buildsystem": "cmake",
                        "config-opts": [
-                               "-DVERSION_SUBSTRING:STRING=' (flatpak)'",
                                "-DENABLE_AUTOAR=OFF",
                                "-DENABLE_CONTACT_MAPS=OFF",
                                "-DENABLE_GNOME_DESKTOP=OFF",
@@ -295,6 +294,14 @@
                                },
 
                                {
+                                       "type": "shell",
+                                       "commands": [
+                                               "cp config.h.in config.h.in.orig",
+                                               "cat config.h.in.orig | sed -e \"s|\\@VERSION_SUBSTRING\\@| 
\\(flatpak git$(git log --pretty=format:%h HEAD^..HEAD)\\)|\" >config.h.in"
+                                       ]
+                               },
+
+                               {
                                        "type": "script",
                                        "commands": [
                                                "echo evolution-flatpak | /app/bin/gnome-keyring-daemon 
--daemonize --unlock &",