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

[Allan McRae]

    Date: Sunday, June 22, 2008 @ 04:26:15
  Author: allan
Revision: 3336

fix merge conflict

Modified:
  fakechroot/repos/extra-x86_64/	(properties)
  fakechroot/repos/extra-x86_64/PKGBUILD
  fakechroot/repos/extra-x86_64/fakechroot.install

--------------------+
 PKGBUILD           |   26 +++++++++++++++-----------
 fakechroot.install |    9 ---------
 2 files changed, 15 insertions(+), 20 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-22 08:22:42 UTC (rev 3335)
+++ extra-x86_64/PKGBUILD	2008-06-22 08:26:15 UTC (rev 3336)
@@ -1,22 +1,26 @@
 # $Id$
-# Maintainer : Aaron Griffin <aaron at archlinux.org>
+# Maintainer : Allan McRae <allan at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=fakechroot
-pkgver=2.5
-pkgrel=2
-pkgdesc="gives a fake chroot environment"
-arch=(i686 x86_64)
+pkgver=2.6
+pkgrel=1.1
+pkgdesc="Gives a fake chroot environment"
+arch=('i686' 'x86_64')
 url="http://fakechroot.alioth.debian.org"
+license=('LGPL')
+options=('!libtool')
 install=fakechroot.install
-depends=('glibc')
-source=(http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_$pkgver.orig.tar.gz)
-md5sums=('b885951b98f4316f9686699e9853513d')
-options=('nolibtool')
+source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
+md5sums=('1ac07b265890cb3b5379327c3c8b07ab')
 
+
 build()
 {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
+  # fix type mismatch on x86_64
+  sed -i "s/int readlink/ssize_t readlink/" src/libfakechroot.c
   ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=${pkgdir} install
 }

Modified: extra-x86_64/fakechroot.install
===================================================================
--- extra-x86_64/fakechroot.install	2008-06-22 08:22:42 UTC (rev 3335)
+++ extra-x86_64/fakechroot.install	2008-06-22 08:26:15 UTC (rev 3336)
@@ -1,4 +1,3 @@
-# arg 1: the new package version
 post_install() {
 	if [ ! "`grep /usr/lib/libfakechroot etc/ld.so.conf`" ]; then
 		echo -n "updating /etc/ld.so.conf... "
@@ -8,21 +7,13 @@
 	fi
 }
 
-# arg 1: the new package version
-# arg 2: the old package version
 post_upgrade() {
 	post_install $1
 }
 
-# arg 1: the old package version
 pre_remove() {
 	echo -ne "\nupdating /etc/ld.so.conf... "
 	sed -i -e '/\/usr\/lib\/libfakechroot/d' etc/ld.so.conf
 	sbin/ldconfig -r .
 	echo "done."
 }
-
-op=$1
-shift
-
-$op $*