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

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 09:22:28
  Author: jgc
Revision: 3190

Fix conflict

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

----------+
 PKGBUILD |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-21 13:21:36 UTC (rev 3189)
+++ extra-x86_64/PKGBUILD	2008-06-21 13:22:28 UTC (rev 3190)
@@ -2,23 +2,23 @@
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libfs
-pkgver=1.0.0
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="X11 Font Services Library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
+license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto' 'fontsproto')
 makedepends=('pkgconfig' 'xtrans')
-_xorg=X11R7.0-RC4
-_relname=libFS
-source=(${url}/releases/${_xorg}/everything/${_relname}-${pkgver}.tar.bz2)
+options=(!libtool)
+source=(${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2)
+md5sums=('81521249353fa33be7a4bb0062c2fbb9')
 
 build() {
-  cd ${startdir}/src/${_relname}-${pkgver}
-  ./configure --prefix=/usr \
-              --build=${CHOST} --host=${CHOST}
+  cd ${startdir}/src/libFS-${pkgver}
+  ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR=${startdir}/pkg install || return 1
-  find ${startdir}/pkg -name '*.la' -exec rm {} \;
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-