[arch-commits] Commit in tipp10/trunk (PKGBUILD)

[Florian Pritz]

    Date: Sunday, March 23, 2014 @ 12:08:31
  Author: bluewind
Revision: 108119

upgpkg: tipp10 2.1.0-6

fix FS#39590 - build fails

Modified:
  tipp10/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2014-03-23 10:57:45 UTC (rev 108118)
+++ PKGBUILD    2014-03-23 11:08:31 UTC (rev 108119)
@@ -4,34 +4,33 @@
 
 pkgname=tipp10
 pkgver=2.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc="intelligent typing tutor"
 arch=('i686' 'x86_64')
 url="http://www.tipp10.com/";
 license=('GPL2')
 depends=('qt4')
-source=(defines.h.patch gcc-4.5.patch \
-  "http://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip";)
+source=(defines.h.patch
+        gcc-4.5.patch \
+        
"http://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip";)
 md5sums=('73a987123ca842026b7bde5e89370b86'
          'a9d388ddb17ae93f13acb915bc8eba57'
          '38c1e1fc9c5ba183279efdd22b318b7a')
 
-_srcdir="$srcdir/tipp10_source_v${pkgver//./-}"
-
 build() {
-  cd "$_srcdir"
+  cd "$srcdir/tipp10_source_v${pkgver//./-}"
 
   sed -i 's#tipp10v2.template#../share/tipp10/tipp10v2.template#' def/defines.h
   patch -p0 < "$srcdir/defines.h.patch"
   patch -p0 < "$srcdir/gcc-4.5.patch"
-  qmake
+  qmake-qt4
   make
 }
 
 package() {
-  cd "$_srcdir"
+  cd "$srcdir/tipp10_source_v${pkgver//./-}"
 
-       make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
   install -Dm755 tipp10 "$pkgdir/usr/bin/tipp10"
   install -Dm644 release/tipp10v2.template 
"$pkgdir/usr/share/tipp10/tipp10v2.template"