updated qpmx to 1.6.0

3 files changed, 10 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3a5a4a92275..cf859d69e3c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qpmx
 	pkgdesc = A frontend for qpm, to provide source and build caching
-	pkgver = 1.5.0
+	pkgver = 1.6.0
 	pkgrel = 1
 	url = https://github.com/Skycoder42/qpmx
 	arch = i686
@@ -10,11 +10,11 @@ pkgbase = qpmx
 	makedepends = git
 	depends = qt5-base
 	depends = qt5-jsonserializer
-	source = qpmx-1.5.0::git+https://github.com/Skycoder42/qpmx.git#tag=1.5.0
+	source = qpmx-1.6.0::git+https://github.com/Skycoder42/qpmx.git#tag=1.6.0
 	source = qpmx.rule
 	source = plugin.rule
 	sha256sums = SKIP
-	sha256sums = 6029d42b05d32d99a6e673e5a7c95ac657e6258f88835f8aff05bde7535e543b
+	sha256sums = 13f2e499671cb094ff244946b733a8e6898152fe60c77cb93bef1e1a19ffbd0e
 	sha256sums = a7f6099680d692285332ae7db3cf1414f4d664ceccb701d45ac73ecaa08a65dc
 
 pkgname = qpmx
diff --git a/PKGBUILD b/PKGBUILD
index dbc99291aef2..60baf57edd48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgbase=qpmx
 pkgname=(qpmx qpmx-gitsource qpmx-qpmsource)
 group=qpmx-full
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="A frontend for qpm, to provide source and build caching"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ source=("$_pkgfqn::git+https://github.com/Skycoder42/$pkgname.git#tag=$pkgver"
         "$pkgname.rule"
         "plugin.rule")
 sha256sums=('SKIP'
-            '6029d42b05d32d99a6e673e5a7c95ac657e6258f88835f8aff05bde7535e543b'
+            '13f2e499671cb094ff244946b733a8e6898152fe60c77cb93bef1e1a19ffbd0e'
             'a7f6099680d692285332ae7db3cf1414f4d664ceccb701d45ac73ecaa08a65dc')
 
 git_submod_rm() {
@@ -35,15 +35,12 @@ prepare() {
   git_submod_rm submodules/qpmx-sample-package
 
   git submodule update --init --recursive
-
-  # fix install of broken install.pri
-  echo "PREFIX = /usr" >> .qmake.conf
 }
 
 build() {
   cd build
 
-  qmake "../$_pkgfqn/"
+  qmake "PREFIX=/usr" "../$_pkgfqn/"
   make qmake_all
   make
 }
@@ -57,10 +54,12 @@ package_qpmx() {
 
   cd build/qpmx
   make INSTALL_ROOT="$pkgdir" install
+  cd ../lib
+  make INSTALL_ROOT="$pkgdir" install
 
   cd "../../$_pkgfqn"
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/${pkgname}.rule"
+  install -D -m644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule"
 }
 
 package_qpmx-qpmsource() {
diff --git a/qpmx.rule b/qpmx.rule
index c9102f02c9d1..bd50640b7d78 100644
--- a/qpmx.rule
+++ b/qpmx.rule
@@ -1 +1 @@
-qt5-base qt5-jsonserializer
+qt5-base{{^(\d+\.\d+\.\d+).*$}} qt5-jsonserializer{{^(\d+\.\d+\.\d+).*$}}