From 2b8db7cd61b6059e6b75e456d115910ef377e7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Kentt=C3=A4l=C3=A4?= <marko.kenttala@jolla.com>
Date: Thu, 7 Feb 2019 14:36:01 +0200
Subject: [PATCH] [sensorfw] Fixed pkgconfig version, contributes to jb#38551

---
 rpm/sensorfw-qt5-hybris.spec |  2 +-
 rpm/sensorfw-qt5.spec        |  3 ++-
 sensorfw.pro                 | 11 ++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/rpm/sensorfw-qt5-hybris.spec b/rpm/sensorfw-qt5-hybris.spec
index 2ef1afc0..dd8a455d 100644
--- a/rpm/sensorfw-qt5-hybris.spec
+++ b/rpm/sensorfw-qt5-hybris.spec
@@ -44,7 +44,7 @@ unset LD_AS_NEEDED
 export LD_RUN_PATH=/usr/lib/sensord-qt5/
 export QT_SELECT=5
 
-%qmake5 CONFIG+=hybris
+%qmake5 CONFIG+=hybris PC_VERSION=`echo %{version} | sed 's/+.*//'`
 
 make %{?_smp_mflags}
 
diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
index 7b3dd512..8dfe9215 100644
--- a/rpm/sensorfw-qt5.spec
+++ b/rpm/sensorfw-qt5.spec
@@ -98,7 +98,8 @@ export QT_SELECT=5
 
 %qmake5  \
     CONFIG+=ssusysinfo\
-    CONFIG+=mce
+    CONFIG+=mce\
+    PC_VERSION=`echo %{version} | sed 's/+.*//'`
 
 make %{?_smp_mflags}
 
diff --git a/sensorfw.pro b/sensorfw.pro
index 3581630a..0b48b54a 100644
--- a/sensorfw.pro
+++ b/sensorfw.pro
@@ -15,7 +15,7 @@ contains(CONFIG,autohybris) {
 
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS = datatypes \ 
+SUBDIRS = datatypes \
           adaptors \
           core \
           filters \
@@ -29,7 +29,7 @@ SUBDIRS = datatypes \
 equals(QT_MAJOR_VERSION, 4): {
     SUBDIRS = datatypes qt-api
 }
-    
+
 contains(CONFIG,configs) {
    # !contains(CONFIG,hybris) {
         SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
@@ -53,10 +53,10 @@ contains(CONFIG,configs) {
 
     SENSORCONFIG_SETUP.files = config/sensord-daemon-conf-setup
     SENSORCONFIG_SETUP.path = /usr/bin
-    
+
      INSTALLS +=  SENSORFWCONFIGFILES SENSORCONFIG_SETUP
  }
-    
+
 contains(CONFIG,hybris) {
 
     SUBDIRS = core/hybris.pro \
@@ -81,11 +81,13 @@ contains(CONFIG,hybris) {
 
     equals(QT_MAJOR_VERSION, 4):{
         PKGCONFIGFILES.files = sensord.pc
+        PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord.pc'
         QTCONFIGFILES.path = /usr/share/qt4/mkspecs/features
     }
 
     equals(QT_MAJOR_VERSION, 5):{
         PKGCONFIGFILES.files = sensord-qt5.pc
+        PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord-qt5.pc'
         QTCONFIGFILES.path = /usr/share/qt5/mkspecs/features
 
     }
@@ -128,4 +130,3 @@ equals(QT_MAJOR_VERSION, 5):  {
 
 }
 OTHER_FILES += config/*
-