[arch-commits] Commit in smplayer/repos (3 files)

[Allan McRae]

    Date: Saturday, June 21, 2008 @ 00:07:55
  Author: allan
Revision: 3165

Merged revisions 1953-3164 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/smplayer/trunk

........
  r3164 | allan | 2008-06-21 14:05:57 +1000 (Sat, 21 Jun 2008) | 2 lines
  
  upgpkg: smplayer 0.6.1-1
      upgpkg: smplayer 0.6.1-1
........

Modified:
  smplayer/repos/extra-i686/	(properties)
  smplayer/repos/extra-i686/ChangeLog
  smplayer/repos/extra-i686/PKGBUILD

-----------+
 ChangeLog |    6 ++++++
 PKGBUILD  |   19 ++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)


Property changes on: smplayer/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /smplayer/trunk:1-1952
   + /smplayer/trunk:1-3164

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2008-06-21 04:05:57 UTC (rev 3164)
+++ extra-i686/ChangeLog	2008-06-21 04:07:55 UTC (rev 3165)
@@ -1,3 +1,9 @@
+2008-06-21  Allan McRae <allan at archlinux.org>
+
+	* smplayer 0.6.1-1
+	* Upstream update
+	* Removed provides/conflicts/replaces
+
 2008-05-23  Eric Belanger  <eric at archlinux.org>
 
 	* smplayer 0.6.0-1

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-21 04:05:57 UTC (rev 3164)
+++ extra-i686/PKGBUILD	2008-06-21 04:07:55 UTC (rev 3165)
@@ -1,31 +1,28 @@
 # $Id$
-# Maintainer: Varun Acharya <varun at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
 # Contributor: shamrok <szamrok at gmail.com>
  
 pkgname=smplayer
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="A complete front-end for MPlayer" 
 arch=('i686' 'x86_64')
 url="http://smplayer.sourceforge.net/" 
 license=('GPL')
 depends=('qt' 'mplayer')
-conflicts=('smplayer-qt4')
-replaces=('smplayer-qt4')
-provides=('smplayer-qt4')
 install=smplayer.install
-source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}final.tar.bz2)
-md5sums=('056ef492305afdfc105874529204358f')
+source=(http://downloads.sourceforge.net/sourceforge/smplayer/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('af89719da92b5aa6760f2d73b0762ec8')
 
 build() { 
-     cd ${startdir}/src/${pkgname}-${pkgver}final
+     cd ${srcdir}/${pkgname}-${pkgver}
 
      make PREFIX=/usr || return 1 
-     make PREFIX=${startdir}/pkg/usr install     
+     make PREFIX=${pkgdir}/usr install     
 
-     mkdir -p ${startdir}/pkg/usr/share/pixmaps
+     mkdir -p ${pkgdir}/usr/share/pixmaps
      ln -s /usr/share/icons/hicolor/64x64/apps/smplayer.png \
-            ${startdir}/pkg/usr/share/pixmaps/
+            ${pkgdir}/usr/share/pixmaps/
 }