[arch-commits] Commit in libshout/repos (4 files)

[Jan de Groot]

    Date: Monday, November 17, 2008 @ 06:43:24
  Author: jgc
Revision: 19191

Fix SVN conflicts

Modified:
  libshout/repos/extra-i686/	(properties)
  libshout/repos/extra-i686/PKGBUILD
  libshout/repos/extra-x86_64/	(properties)
  libshout/repos/extra-x86_64/PKGBUILD

-----------------------+
 extra-i686/PKGBUILD   |   19 ++++++++++---------
 extra-x86_64/PKGBUILD |   19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)


Property changes on: libshout/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /libshout/trunk:1
   + /libshout/trunk:1-19190

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-17 11:41:39 UTC (rev 19190)
+++ extra-i686/PKGBUILD	2008-11-17 11:43:24 UTC (rev 19191)
@@ -1,22 +1,23 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
-# Contributer: Jason Chu <jchu at xentac.net>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: arjan <arjan at archlinux.org>
+# Contributor: Jason Chu <jchu at xentac.net>
 
 pkgname=libshout
 pkgver=2.2.2
 pkgrel=2
-force=y
 pkgdesc="Library for accessing a shoutcast/icecast server"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 depends=('libvorbis' 'libtheora' 'speex')
 url="http://www.icecast.org/"
-options=('NOLIBTOOL')
-source=(http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
+options=('!libtool' 'force')
+license=('LGPL2')
+source=(http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('4f75fc9901c724b712c371c9a1e782d3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make LDFLAGS+=-lspeex || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }


Property changes on: libshout/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /libshout/trunk:1
   + /libshout/trunk:1-19190

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-17 11:41:39 UTC (rev 19190)
+++ extra-x86_64/PKGBUILD	2008-11-17 11:43:24 UTC (rev 19191)
@@ -1,22 +1,23 @@
 # $Id$
-# Maintainer: arjan <arjan at archlinux.org>
-# Contributer: Jason Chu <jchu at xentac.net>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: arjan <arjan at archlinux.org>
+# Contributor: Jason Chu <jchu at xentac.net>
 
 pkgname=libshout
 pkgver=2.2.2
 pkgrel=2
-force=y
 pkgdesc="Library for accessing a shoutcast/icecast server"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 depends=('libvorbis' 'libtheora' 'speex')
 url="http://www.icecast.org/"
-options=('NOLIBTOOL')
-source=(http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
+options=('!libtool' 'force')
+license=('LGPL2')
+source=(http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('4f75fc9901c724b712c371c9a1e782d3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make LDFLAGS+=-lspeex || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 }