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

[Thomas Bächler]

    Date: Sunday, August 29, 2010 @ 06:28:03
  Author: thomas
Revision: 89079

Clean up PKGBUILD and resolve conflict with v4l-utils

Modified:
  ivtv-utils/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-29 09:05:43 UTC (rev 89078)
+++ PKGBUILD	2010-08-29 10:28:03 UTC (rev 89079)
@@ -4,7 +4,7 @@
 
 pkgname=ivtv-utils
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Userspace utilities for Hauppauge PVR cards"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,15 +17,20 @@
  
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  make
+}
 
-  make || return 1
-  make DESTDIR="${pkgdir}" PREFIX=/usr install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" PREFIX=/usr install
 
-  cd ${srcdir}
+  cd "${srcdir}"
   for file in v4l-cx2341x-dec.fw  v4l-cx2341x-enc.fw v4l-pvrusb2-24xxx-01.fw  v4l-pvrusb2-29xxx-01.fw v4l-cx2341x-init.mpg; do
-    install -D -m644 $file "${pkgdir}/lib/firmware/$file" || return 1
+    install -D -m644 $file "${pkgdir}/lib/firmware/$file"
   done
 
   # FS#15133 - files already provided by the kernel-headers package
-  rm -rf ${pkgdir}/usr/include
+  rm -rf "${pkgdir}"/usr/include
+  # Resolve conflict with v4l-utils
+  rm -f "${pkgdir}"/usr/bin/v4l2-ctl
 }