Merge branch 'jb38551-pkgconfig-version' into 'master'

[devicelock] Properly link package and .pc version. Contributes to JB#38551 See merge request mer-core/nemo-qml-plugin-devicelock!37
sailfishos · Dec 13, 2018 · 2b44347 · 2b44347
2 parents 3451c2f + 7cbbe37
commit 2b44347
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/rpm/nemo-qml-plugin-devicelock.spec b/rpm/nemo-qml-plugin-devicelock.spec
@@ -55,7 +55,7 @@ Requires:   pkgconfig(nemodbus)
 %setup -q -n %{name}-%{version}
 
 %build
-%qmake5
+%qmake5 "VERSION=%{version}"
 make %{?_smp_mflags}
 
 %install

diff --git a/src/nemo-devicelock/lib.pro b/src/nemo-devicelock/lib.pro
@@ -63,6 +63,7 @@ QMAKE_PKGCONFIG_DESCRIPTION = Library for Nemo device lock.
 QMAKE_PKGCONFIG_LIBDIR = $$target.path
 QMAKE_PKGCONFIG_INCDIR = /usr/include
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+QMAKE_PKGCONFIG_VERSION = $$VERSION
 
 INSTALLS += \
         private_headers \