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

[Eric Belanger]

    Date: Saturday, July 5, 2008 @ 01:14:20
  Author: eric
Revision: 4200

fixing svn conflict

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

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


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-05 05:10:33 UTC (rev 4199)
+++ extra-x86_64/PKGBUILD	2008-07-05 05:14:20 UTC (rev 4200)
@@ -1,19 +1,18 @@
 # $Id$
-# Maintainer: Judd Vinet <jvinet at zeroflux.org>
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
 pkgname=isapnptools
-pkgver=1.26
-pkgrel=1
+pkgver=1.27
+pkgrel=2
 pkgdesc="allow ISA Plug-And-Play devices to be configured on a Linux machine"
-arch=(i686 x86_64)
 url="http://www.roestock.demon.co.uk/isapnptools/"
 depends=('glibc')
-source=(ftp://metalab.unc.edu/pub/Linux/system/hardware/isapnptools-$pkgver.tgz \
-        isapnptools-1.26-gcc4.patch)
-md5sums=('26def2016548edeafe383113f0bc8ac6' 'fb7a1d631338ee874e10910ab0b58ce8')
+arch=('i686' 'x86_64')
+license=('GPL2')
+source=(ftp://metalab.unc.edu/pub/Linux/system/hardware/isapnptools-$pkgver.tgz)
+md5sums=('b997ba56583dc850fce9b93d658dfa0c')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ../isapnptools-1.26-gcc4.patch || return 1
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=$startdir/pkg install