[arch-commits] Commit in nuvexport/repos (3 files)

[Giovanni Scafora]

    Date: Wednesday, February 10, 2010 @ 12:36:43
  Author: giovanni
Revision: 68078

Merged revisions 68076 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/nuvexport/trunk

........
  r68076 | giovanni | 2010-02-10 18:34:55 +0100 (mer, 10 feb 2010) | 1 line
........

Modified:
  nuvexport/repos/extra-x86_64/	(properties)
  nuvexport/repos/extra-x86_64/PKGBUILD
Deleted:
  nuvexport/repos/extra-x86_64/nuvexport-ipod-disable.patch

------------------------------+
 PKGBUILD                     |   18 ++++++++++--------
 nuvexport-ipod-disable.patch |   12 ------------
 2 files changed, 10 insertions(+), 20 deletions(-)


Property changes on: nuvexport/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /nuvexport/trunk:1-36134
   + /nuvexport/trunk:1-68077

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-10 17:35:54 UTC (rev 68077)
+++ extra-x86_64/PKGBUILD	2010-02-10 17:36:43 UTC (rev 68078)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Paul Mattal <paul at archlinux.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
 # Contributor: Paul Mattal <paul at mattal.com>
 # Contributor: Jeremy Sands <cto at jeremysands.com>
 
@@ -8,17 +9,18 @@
 relnum=0.5
 pkgrel=1
 pkgdesc="Export for MythTV nuv files to other formats (DVD/SVCD/DivX,etc.)"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://forevermore.net/files/nuvexport"
-license=('GPL2')
-depends=(perl perl-dbi 'ffmpeg>=0.5' perl-dbd-mysql perl-date-manip)
+license=('GPL')
+depends=('ffmpeg>=0.5' 'perl-dbd-mysql' 'perl-date-manip')
 backup=('etc/nuvexportrc')
 install=${pkgname}.install
-source=(http://forevermore.net/files/nuvexport/$pkgname-$relnum-0.$pkgver.svn.tar.bz2)
+source=(http://forevermore.net/files/nuvexport/${pkgname}-$relnum-0.$pkgver.svn.tar.bz2)
 md5sums=('b6e4d973c5b53fb4dd2ba7e04b599496')
 
 build() {
-  cd $srcdir/$pkgname-$relnum
-  make INSTALL=/bin/install prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install || return 1
-  sed -i "s|/tmp/fifodir|/var/tmp/fifodir|g" $pkgdir/usr/share/nuvexport/export/*.pm || return 1
+  cd "${srcdir}/${pkgname}-${relnum}"
+
+  make INSTALL=/bin/install prefix="${pkgdir}/usr" sysconfdir="${pkgdir}/etc" install || return 1
+  sed -i "s|/tmp/fifodir|/var/tmp/fifodir|g" ${pkgdir}/usr/share/nuvexport/export/*.pm || return 1
 }

Deleted: extra-x86_64/nuvexport-ipod-disable.patch
===================================================================
--- extra-x86_64/nuvexport-ipod-disable.patch	2010-02-10 17:35:54 UTC (rev 68077)
+++ extra-x86_64/nuvexport-ipod-disable.patch	2010-02-10 17:36:43 UTC (rev 68078)
@@ -1,12 +0,0 @@
-diff -urN nuvexport-0.3/nuvexport nuvexport-0.3-fixed/nuvexport
---- nuvexport-0.3/nuvexport	2006-07-26 03:37:13.000000000 -0400
-+++ nuvexport-0.3-fixed/nuvexport	2006-07-27 20:58:41.000000000 -0400
-@@ -93,7 +93,7 @@
-         push @Exporters, export::ffmpeg::ASF->new;
-         push @Exporters, export::ffmpeg::MP3->new;
-         push @Exporters, export::ffmpeg::PSP->new;
--        push @Exporters, export::ffmpeg::iPod->new;
-+#        push @Exporters, export::ffmpeg::iPod->new;
-     }
-     elsif ($export_prog eq 'mencoder') {
-         push @Exporters, export::mencoder::XviD->new;