[arch-commits] Commit in libid3tag/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Bélanger]

    Date: Friday, April 10, 2009 @ 01:29:23
  Author: eric
Revision: 34559

Fixed svn conflict

Modified:
  libid3tag/repos/extra-x86_64/	(properties)
  libid3tag/repos/extra-x86_64/PKGBUILD

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


Property changes on: libid3tag/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libid3tag/trunk:1
   + /libid3tag/trunk:1-34558

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-10 05:28:05 UTC (rev 34558)
+++ extra-x86_64/PKGBUILD	2009-04-10 05:29:23 UTC (rev 34559)
@@ -2,20 +2,20 @@
 # Maintainer: dorphell <dorphell at archlinux.org>
 pkgname=libid3tag
 pkgver=0.15.1b
-pkgrel=2
+pkgrel=3
 pkgdesc="library for id3 tagging"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.underbit.com/products/mad/"
+license=('GPL')
 depends=('zlib')
+options=(!libtool)
 source=(ftp://ftp.mars.org/pub/mpeg/$pkgname-$pkgver.tar.gz id3tag.pc)
-url="http://www.underbit.com/products/mad/"
 md5sums=('e5808ad997ba32c498803822078748c3' 'cd5ea001dc24505040b781ad1de9ddf2')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 $startdir/src/id3tag.pc $startdir/pkg/usr/lib/pkgconfig/id3tag.pc
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  make DESTDIR=$pkgdir install || return 1
+  install -D -m644 $srcdir/id3tag.pc $pkgdir/usr/lib/pkgconfig/id3tag.pc
 }