[arch-commits] Commit in linuxtv-dvb-apps/trunk (PKGBUILD)

[Balló György]

    Date: Monday, December 23, 2013 @ 11:19:50
  Author: bgyorgy
Revision: 102878

upgpkg: linuxtv-dvb-apps 1504-1

Update to version 1504, remove conflict with xbase (FS#37862)

Modified:
  linuxtv-dvb-apps/trunk/PKGBUILD

----------+
 PKGBUILD |   40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-23 09:31:18 UTC (rev 102877)
+++ PKGBUILD	2013-12-23 10:19:50 UTC (rev 102878)
@@ -4,29 +4,37 @@
 # Contributor: Camille Moncelier <pix at devlife.org>
 
 pkgname=linuxtv-dvb-apps
-pkgver=1486
+pkgver=1504
 pkgrel=1
-_hgrev=3fc7dfa68484
-pkgdesc='Viewer programs for DVB cards'
+_hgrev=d40083fff895
+pkgdesc='Linux DVB API applications and utilities'
 arch=('i686' 'x86_64')
 url='http://www.linuxtv.org/'
 license=('GPL')
-source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2")
-sha256sums=('60cfd45fe7417a4445a7814ce6e645ddaad0f8e934015c09d53eb93c8739b35a')
+depends=('glibc')
+makedepends=('mercurial')
+source=("hg+http://linuxtv.org/hg/dvb-apps/#revision=$_hgrev")
+sha256sums=('SKIP')
 
-build() {
-  cd "dvb-apps-$_hgrev"
-  rm -rf include
+pkgver() {
+  cd "dvb-apps"
+  echo $(hg identify -n)
+}
 
-  make -C lib
-  make -C util
+prepare() {
+  cd "dvb-apps"
+  # Fix build
+  sed -i '/$(sharedir)\/dvb\//d' util/scan/Makefile
 }
 
+build() {
+  cd "dvb-apps"
+  make
+}
+
 package() {
-  cd "dvb-apps-$_hgrev"
-
-  make -C lib DESTDIR="$pkgdir" install
-  make -C util DESTDIR="$pkgdir" install
-
-  chmod 755 "$pkgdir"/usr/lib/*.so*
+  cd "dvb-apps"
+  make DESTDIR="$pkgdir" install
+  # Remove conflict with xbase (FS#37862)
+  mv "$pkgdir"/usr/bin/{zap,dvbzap}
 }