From 912123c35492172a4516d0c1d32d6c8cd41cc90b Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 7 Jun 2011 11:49:24 +0000 Subject: main/libgphoto2: clean up libtool archives should fix building gvfs --- main/libgphoto2/APKBUILD | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'main/libgphoto2') diff --git a/main/libgphoto2/APKBUILD b/main/libgphoto2/APKBUILD index d33d2ba5d2..da8189ff1c 100644 --- a/main/libgphoto2/APKBUILD +++ b/main/libgphoto2/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=libgphoto2 pkgver=2.4.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." url="http://www.gphoto.org" arch="all" @@ -11,6 +11,7 @@ depends_dev="libexif-dev libusb-compat-dev" makedepends="libexif-dev jpeg-dev libtool libusb-compat-dev libiconv-dev" install="$pkgname.pre-install $pkgname.pre-upgrade" subpackages="$pkgname-dev $pkgname-doc" +replaces="libgphoto2-dev" source="http://downloads.sourceforge.net/gphoto/libgphoto2-$pkgver.tar.bz2" _builddir="$srcdir"/$pkgname-$pkgver @@ -27,11 +28,21 @@ build() { package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 - rm -f $pkgdir/usr/lib/libgphoto2/$pkgver/*.a + rm -f "$pkgdir"/usr/lib/libgphoto2/*/*.a \ + "$pkgdir"/usr/lib/*.la \ + "$pkgdir"/usr/lib/*.a + install -m755 -d "$pkgdir/lib/udev/rules.d" LD_LIBRARY_PATH="$pkgdir/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ CAMLIBS="$pkgdir/usr/lib/libgphoto2/$pkgver" \ "$pkgdir/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 group camera mode 0660 > "$pkgdir/lib/udev/rules.d/54-gphoto.rules" || return 1 } +dev() { + default_dev + # move back .la files for libltdl + mv "$subpkgdir"/usr/lib/libgphoto2/$pkgver/*.la \ + "$pkgdir"/usr/lib/libgphoto2/$pkgver/ +} + md5sums="362cd914c64b2363f4d0bd5ad07c7209 libgphoto2-2.4.10.1.tar.bz2" -- cgit v1.2.3