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

[Tobias Powalowski]

    Date: Sunday, September 28, 2008 @ 04:35:01
  Author: tpowa
Revision: 13730

Merged revisions 13727 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/amarok-base/trunk

........
  r13727 | tpowa | 2008-09-28 08:26:23 +0000 (So, 28 Sep 2008) | 1 line
  
  upgpkg: amarok-base 1.4.10-1
........

Modified:
  amarok-base/repos/extra-i686/	(properties)
  amarok-base/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)


Property changes on: amarok-base/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /amarok-base/trunk:1-6662
   + /amarok-base/trunk:1-13729

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-28 08:27:13 UTC (rev 13729)
+++ extra-i686/PKGBUILD	2008-09-28 08:35:01 UTC (rev 13730)
@@ -4,26 +4,25 @@
 pkgname=amarok-base
 _origname=amarok
 replaces=("${_origname}" 'amarok-base-mysqlfree')
-pkgver=1.4.9.1
-pkgrel=2
+pkgver=1.4.10
+pkgrel=1
 pkgdesc="amaroK - a media player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
 license=('GPL')
-depends=('amarok-engine' 'qt3' 'libmp4v2' 'libmysqlclient>=5.0.45' 'postgresql-libs>=8.2.4' 'ruby' 'tunepimp>=0.5.3')
+depends=('amarok-engine-xine=1.4.10' 'qt3' 'libmp4v2' 'libmysqlclient>=5.0.45' 'postgresql-libs>=8.2.4' 'ruby' 'tunepimp>=0.5.3')
 makedepends=('pkgconfig' 'kdelibs3' 'libgpod>=0.6.0' 'libifp>=1.0.0.2' 'libmtp>=0.2.6.1' 'libnjb>=2.2.5' 'libvisual>=0.4.0' 'xine-lib>=1.1.8' 'sdl>=1.2.12')
 # advanced scripting depends on python
 install=amarok.install
 #source=(http://mark.kollide.net/amarok-${pkgver}.tar.bz2
 source=("ftp://ftp.solnet.ch/mirror/KDE/stable/amarok/${pkgver}/src/${_origname}-${pkgver}.tar.bz2"
 	"amarok_addaspodcast.desktop")
-md5sums=('aa588778379a391ad3f4b3fc770217e4' '7736a7e3e22b15818180df3cee7e4a79')
+options=(!makeflags)
 
 build() {
-  export MAKEFLAGS="-j1"
   cd ${startdir}/src/${_origname}-${pkgver}
-  [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
-  [ -z "${KDEDIR}" ] && . /etc/profile.d/kde3.sh
+  . /etc/profile.d/qt3.sh
+  . /etc/profile.d/kde3.sh
    
   # prepare build
   ./configure --prefix=/opt/kde \
@@ -45,7 +44,8 @@
 	--enable-debug=no \
 	--without-xmms || return 1
 
-  # bulid
+  # build
+  sed -i -e 's/konquisidebar//g' amarok/src/Makefile
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
@@ -57,4 +57,5 @@
   mkdir -p ${startdir}/pkg/opt/kde/share/apps/konqueror/servicemenus/
   install -m644 ${startdir}/src/amarok_addaspodcast.desktop ${startdir}/pkg/opt/kde/share/apps/konqueror/servicemenus/
 }
-
+md5sums=('3bdbf26181bf5e5925f48968caba7ac2'
+         '7736a7e3e22b15818180df3cee7e4a79')