Do not hardcode version number in sources

Also no need to pass version explicitly to pkgconfig creator
sailfishos · Aug 23, 2018 · 7e024d4 · 7e024d4
1 parent ef9b056
commit 7e024d4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/lib/lib.pro b/lib/lib.pro
@@ -7,8 +7,6 @@ QT -= gui
 QMAKE_CXXFLAGS += -Wno-unused-parameter -Wno-psabi
 INCLUDEPATH += include
 
-include(version.pri)
-
 TEMPLATE = lib
 DEFINES += QMCE_LIBRARY
 
@@ -59,6 +57,5 @@ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 QMAKE_PKGCONFIG_INCDIR = $$headers.path
 QMAKE_PKGCONFIG_DESCRIPTION = Qt bindings for mce
 QMAKE_PKGCONFIG_PREFIX = $$PREFIX
-QMAKE_PKGCONFIG_VERSION = $$VERSION
 
 INSTALLS += target headers pkgconfig
diff --git a/lib/version.pri b/lib/version.pri
diff --git a/rpm/libmce-qt5.spec b/rpm/libmce-qt5.spec
@@ -42,7 +42,7 @@ This package contains the development header files for libmce-qt5
 %setup -q -n %{name}-%{version}
 
 %build
-%qtc_qmake5
+%qtc_qmake5 "VERSION=$(sed 's/+.*//' <<<"%{version}")"
 %qtc_make %{?_smp_mflags}
 
 %install