[arch-commits] Commit in mplayer/trunk (PKGBUILD)

[Ionut Biru]

    Date: Tuesday, June 21, 2011 @ 14:32:19
  Author: ibiru
Revision: 128080

fix manual conflict

Modified:
  mplayer/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-21 17:47:20 UTC (rev 128079)
+++ PKGBUILD	2011-06-21 18:32:19 UTC (rev 128080)
@@ -4,8 +4,8 @@
 
 pkgbase=mplayer
 pkgname=('mplayer' 'mencoder')
-pkgver=33643
-pkgrel=2
+pkgver=33690
+pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
@@ -14,7 +14,7 @@
 url="http://www.mplayerhq.hu/"
 options=(!buildflags !emptydirs)
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('0371a9c3c245dc8cd4bee5dbbd51cd5d'
+md5sums=('7efa332d381a1461f8518730f8c52e4d'
          'c0d6ef795cf6de48e3b87ff7c23f0319')
 
 build() {
@@ -66,4 +66,5 @@
 
     cd ${srcdir}/${pkgbase}
     make DESTDIR=${pkgdir} install-mencoder install-mencoder-man
+    find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
 }