[arch-commits] Commit in phonon/kde-unstable (PKGBUILD)

[Pierre Schmitz]

    Date: Saturday, July 18, 2009 @ 09:28:22
  Author: pierre
Revision: 46469

fix file conflict

Modified:
  phonon/kde-unstable/PKGBUILD

----------+
 PKGBUILD |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 13:24:45 UTC (rev 46468)
+++ PKGBUILD	2009-07-18 13:28:22 UTC (rev 46469)
@@ -4,12 +4,12 @@
 pkgbase=phonon
 pkgname=('phonon-xine')
 pkgver=4.3.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org'
 license=('LGPL')
 install=phonon.install
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'qt>=4.5.2-3' 'xine-lib')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'qt>=4.5.2-4' 'xine-lib')
 source=("http://download.kde.org/stable/4.2.1/src/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('767cb68052c108e95f293f30acdef3fb')
 
@@ -42,4 +42,5 @@
 	make DESTDIR=$pkgdir install
 	mv $pkgdir/usr/lib/kde4 $pkgdir/usr/lib/qt
 	mv $pkgdir/usr/share/icons/oxygen $pkgdir/usr/share/icons/hicolor
+	rm -f $pkgdir/usr/lib/pkgconfig/phonon.pc
 }