[arch-commits] Commit in twinkle/repos (extra-i686 extra-i686/PKGBUILD)

[Giovanni Scafora]

    Date: Wednesday, July 8, 2009 @ 17:02:03
  Author: giovanni
Revision: 45257

Merged revisions 45255 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/twinkle/trunk

........
  r45255 | giovanni | 2009-07-08 13:47:30 -0700 (mer, 08 lug 2009) | 2 lines
  
  upgpkg: twinkle 1.4.1-4
      Fixed FS15444
........

Modified:
  twinkle/repos/extra-i686/	(properties)
  twinkle/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


Property changes on: twinkle/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /twinkle/trunk:1-45188
   + /twinkle/trunk:1-45256

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-08 20:48:08 UTC (rev 45256)
+++ extra-i686/PKGBUILD	2009-07-08 21:02:03 UTC (rev 45257)
@@ -5,12 +5,12 @@
 
 pkgname=twinkle
 pkgver=1.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.twinklephone.com/"
 license=('GPL')
-depends=('speex>=1.2rc1' 'boost>=1.39.0' 'libsndfile' 'qt3' 'libzrtpcpp>=1.3.0')
+depends=('file' 'speex>=1.2rc1' 'boost' 'libsndfile' 'qt3' 'libzrtpcpp')
 makedepends=('pkgconfig')
 conflicts=('twinkle-kdefree')
 replaces=('twinkle-kdefree')
@@ -20,9 +20,11 @@
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   . /etc/profile.d/qt3.sh
-  ./configure --prefix=/usr --without-kde --with-speex || return 1
+  ./configure --prefix=/usr \
+              --without-kde \
+	      --with-speex
   make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 twinkle.desktop ${pkgdir}/usr/share/applications/ || return 1
+  make DESTDIR=${pkgdir} install
+  install -D -m644 twinkle.desktop ${pkgdir}/usr/share/applications/twinkle.desktop 
 }
+