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

[Thomas Bächler]

    Date: Sunday, August 29, 2010 @ 06:28:14
  Author: thomas
Revision: 89080

Resolve conflict with ivtv-utils

Modified:
  v4l-utils/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-29 10:28:03 UTC (rev 89079)
+++ PKGBUILD	2010-08-29 10:28:14 UTC (rev 89080)
@@ -1,8 +1,8 @@
 # $Id$
-# Maintainer: Thomas Baechler <thomas at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=v4l-utils
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/libv4l"
@@ -26,5 +26,6 @@
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make install PREFIX="/usr" DESTDIR="${pkgdir}/" || return 1
+  make install PREFIX="/usr" DESTDIR="${pkgdir}/"
+  rm -f "${pkgdir}/usr/bin/ivtv-ctl"
 }