[arch-commits] Commit in linuxtv-dvb-apps/repos (4 files)

[Balló György]

    Date: Monday, December 23, 2013 @ 11:19:57
  Author: bgyorgy
Revision: 102879

archrelease: copy trunk to community-i686, community-x86_64

Added:
  linuxtv-dvb-apps/repos/community-i686/PKGBUILD
    (from rev 102878, linuxtv-dvb-apps/trunk/PKGBUILD)
  linuxtv-dvb-apps/repos/community-x86_64/PKGBUILD
    (from rev 102878, linuxtv-dvb-apps/trunk/PKGBUILD)
Deleted:
  linuxtv-dvb-apps/repos/community-i686/PKGBUILD
  linuxtv-dvb-apps/repos/community-x86_64/PKGBUILD

---------------------------+
 /PKGBUILD                 |   80 ++++++++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD   |   32 -----------------
 community-x86_64/PKGBUILD |   32 -----------------
 3 files changed, 80 insertions(+), 64 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-12-23 10:19:50 UTC (rev 102878)
+++ community-i686/PKGBUILD	2013-12-23 10:19:57 UTC (rev 102879)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-# Contributor: Camille Moncelier <pix at devlife.org>
-
-pkgname=linuxtv-dvb-apps
-pkgver=1486
-pkgrel=1
-_hgrev=3fc7dfa68484
-pkgdesc='Viewer programs for DVB cards'
-arch=('i686' 'x86_64')
-url='http://www.linuxtv.org/'
-license=('GPL')
-source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2")
-sha256sums=('60cfd45fe7417a4445a7814ce6e645ddaad0f8e934015c09d53eb93c8739b35a')
-
-build() {
-  cd "dvb-apps-$_hgrev"
-  rm -rf include
-
-  make -C lib
-  make -C util
-}
-
-package() {
-  cd "dvb-apps-$_hgrev"
-
-  make -C lib DESTDIR="$pkgdir" install
-  make -C util DESTDIR="$pkgdir" install
-
-  chmod 755 "$pkgdir"/usr/lib/*.so*
-}

Copied: linuxtv-dvb-apps/repos/community-i686/PKGBUILD (from rev 102878, linuxtv-dvb-apps/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-12-23 10:19:57 UTC (rev 102879)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Camille Moncelier <pix at devlife.org>
+
+pkgname=linuxtv-dvb-apps
+pkgver=1504
+pkgrel=1
+_hgrev=d40083fff895
+pkgdesc='Linux DVB API applications and utilities'
+arch=('i686' 'x86_64')
+url='http://www.linuxtv.org/'
+license=('GPL')
+depends=('glibc')
+makedepends=('mercurial')
+source=("hg+http://linuxtv.org/hg/dvb-apps/#revision=$_hgrev")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "dvb-apps"
+  echo $(hg identify -n)
+}
+
+prepare() {
+  cd "dvb-apps"
+  # Fix build
+  sed -i '/$(sharedir)\/dvb\//d' util/scan/Makefile
+}
+
+build() {
+  cd "dvb-apps"
+  make
+}
+
+package() {
+  cd "dvb-apps"
+  make DESTDIR="$pkgdir" install
+  # Remove conflict with xbase (FS#37862)
+  mv "$pkgdir"/usr/bin/{zap,dvbzap}
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-12-23 10:19:50 UTC (rev 102878)
+++ community-x86_64/PKGBUILD	2013-12-23 10:19:57 UTC (rev 102879)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-# Contributor: Camille Moncelier <pix at devlife.org>
-
-pkgname=linuxtv-dvb-apps
-pkgver=1486
-pkgrel=1
-_hgrev=3fc7dfa68484
-pkgdesc='Viewer programs for DVB cards'
-arch=('i686' 'x86_64')
-url='http://www.linuxtv.org/'
-license=('GPL')
-source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2")
-sha256sums=('60cfd45fe7417a4445a7814ce6e645ddaad0f8e934015c09d53eb93c8739b35a')
-
-build() {
-  cd "dvb-apps-$_hgrev"
-  rm -rf include
-
-  make -C lib
-  make -C util
-}
-
-package() {
-  cd "dvb-apps-$_hgrev"
-
-  make -C lib DESTDIR="$pkgdir" install
-  make -C util DESTDIR="$pkgdir" install
-
-  chmod 755 "$pkgdir"/usr/lib/*.so*
-}

Copied: linuxtv-dvb-apps/repos/community-x86_64/PKGBUILD (from rev 102878, linuxtv-dvb-apps/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-12-23 10:19:57 UTC (rev 102879)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jonathan Conder <jonno.conder at gmail.com>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Camille Moncelier <pix at devlife.org>
+
+pkgname=linuxtv-dvb-apps
+pkgver=1504
+pkgrel=1
+_hgrev=d40083fff895
+pkgdesc='Linux DVB API applications and utilities'
+arch=('i686' 'x86_64')
+url='http://www.linuxtv.org/'
+license=('GPL')
+depends=('glibc')
+makedepends=('mercurial')
+source=("hg+http://linuxtv.org/hg/dvb-apps/#revision=$_hgrev")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "dvb-apps"
+  echo $(hg identify -n)
+}
+
+prepare() {
+  cd "dvb-apps"
+  # Fix build
+  sed -i '/$(sharedir)\/dvb\//d' util/scan/Makefile
+}
+
+build() {
+  cd "dvb-apps"
+  make
+}
+
+package() {
+  cd "dvb-apps"
+  make DESTDIR="$pkgdir" install
+  # Remove conflict with xbase (FS#37862)
+  mv "$pkgdir"/usr/bin/{zap,dvbzap}
+}