[arch-commits] Commit in qwt/trunk (PKGBUILD qwtconfig-archlinux.pri)

[Ronald van Haren]

    Date: Friday, April 3, 2015 @ 14:37:54
  Author: ronald
Revision: 235384

upgpkg: qwt 6.1.2-1

update to 6.1.2

Modified:
  qwt/trunk/PKGBUILD
  qwt/trunk/qwtconfig-archlinux.pri

-------------------------+
 PKGBUILD                |   12 ++++++++----
 qwtconfig-archlinux.pri |    4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-03 12:26:40 UTC (rev 235383)
+++ PKGBUILD	2015-04-03 12:37:54 UTC (rev 235384)
@@ -2,7 +2,7 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qwt
-pkgver=6.1.1
+pkgver=6.1.2
 pkgrel=1
 pkgdesc="Qt Widgets for Technical Applications"
 arch=('i686' 'x86_64')
@@ -11,15 +11,19 @@
 license=("custom:$pkgname")
 source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.bz2" \
         "qwtconfig-archlinux.pri")
-sha1sums=('6d142cb9725da7e03fbb507532fc268b5212080a'
-          'aba0fc75f6d450237028b7b143bdcf05a79cabb3')
+sha1sums=('6af82b6ee4132f779d1c8c2db872f01463b0d61c'
+          '8731482ed25467b7c0ec476df5c17f40c114cea0')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # copy our config file to the right place
   cp ${srcdir}/qwtconfig-archlinux.pri qwtconfig.pri
+}
 
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   # build qwt:
   qmake-qt4 qwt.pro
   make

Modified: qwtconfig-archlinux.pri
===================================================================
--- qwtconfig-archlinux.pri	2015-04-03 12:26:40 UTC (rev 235383)
+++ qwtconfig-archlinux.pri	2015-04-03 12:37:54 UTC (rev 235384)
@@ -9,7 +9,7 @@
 
 QWT_VER_MAJ      = 6
 QWT_VER_MIN      = 1
-QWT_VER_PAT      = 0
+QWT_VER_PAT      = 2
 QWT_VERSION      = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT}
 
 ######################################################################
@@ -28,7 +28,7 @@
 
 QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/share/doc/qwt
 QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qwt
-QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
+QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib/qwt
 
 ######################################################################
 # Designer plugin