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

[Pierre Schmitz]

    Date: Thursday, August 27, 2009 @ 18:25:49
  Author: pierre
Revision: 50482

Merged revisions 50481 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/phonon-xine/trunk

........
  r50481 | pierre | 2009-08-28 00:24:47 +0200 (Fr, 28 Aug 2009) | 1 line
  
  fix merge error
........

Modified:
  phonon-xine/repos/extra-i686/	(properties)
  phonon-xine/repos/extra-i686/PKGBUILD

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


Property changes on: phonon-xine/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /phonon-xine/trunk:1-47364
   + /phonon-xine/trunk:1-50481

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-27 22:24:47 UTC (rev 50481)
+++ extra-i686/PKGBUILD	2009-08-27 22:25:49 UTC (rev 50482)
@@ -1,7 +1,7 @@
 # $ Id: $
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
-pkgbase=phonon-xine
+pkgname=phonon-xine
 pkgver=4.3.1
 pkgrel=2
 pkgdesc='Xine backend for phonon'
@@ -11,7 +11,7 @@
 install=phonon.install
 depends=('qt>=4.5.2-3' 'xine-lib')
 makedepends=('pkgconfig' 'cmake' 'automoc4')
-source=("http://download.kde.org/stable/4.2.1/src/${pkgbase}-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/4.2.1/src/phonon-${pkgver}.tar.bz2")
 md5sums=('767cb68052c108e95f293f30acdef3fb')
 
 build() {
@@ -21,7 +21,7 @@
 	sed -e '/add_subdirectory(phonon)/d' \
 	    -e '/add_subdirectory(includes)/d' \
 	    -i ../phonon-${pkgver}/CMakeLists.txt
-	cmake ../${pkgbase}-${pkgver} \
+	cmake ../phonon-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_SKIP_RPATH=ON \