From 309f8292804272860e9f8b10ab4f97bc18dbdd1a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 9 Mar 2012 01:13:02 +0100 Subject: [PATCH] libgphoto2: update to 2.4.13. --- srcpkgs/libgphoto2/libgphoto2-devel.template | 3 +-- srcpkgs/libgphoto2/template | 22 +++++++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/srcpkgs/libgphoto2/libgphoto2-devel.template b/srcpkgs/libgphoto2/libgphoto2-devel.template index b637a4aa77..99622ba315 100644 --- a/srcpkgs/libgphoto2/libgphoto2-devel.template +++ b/srcpkgs/libgphoto2/libgphoto2-devel.template @@ -9,8 +9,7 @@ Add_dependency run libexif-devel Add_dependency run libusb-compat-devel Add_dependency run libgphoto2 -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib diff --git a/srcpkgs/libgphoto2/template b/srcpkgs/libgphoto2/template index f300ab5c96..8bb0f57ad2 100644 --- a/srcpkgs/libgphoto2/template +++ b/srcpkgs/libgphoto2/template @@ -1,12 +1,14 @@ # Template file for 'libgphoto2' pkgname=libgphoto2 -version=2.4.11 +version=2.4.13 +homepage="http://www.gphoto.org" distfiles="${SOURCEFORGE_SITE}/gphoto/$pkgname-$version.tar.bz2" build_style=gnu-configure configure_args="--disable-rpath udevscriptdir=/lib/udev" short_desc="Digital camera access library" maintainer="Juan RP " -checksum=5116bbacea57dfe22585e8e939ea30b5fb99fe08de526002788c84e37105c423 +license="GPL-2" +checksum=01bce1c3f89fbaca571cb2b5be1f2980a0095c5f6516e33a8273d65b9dc8e70e long_desc=" libgphoto2 is the core library designed to allow access to digital camera by external programs. Here is an overview of the global @@ -28,13 +30,17 @@ Add_dependency build jpeg-devel Add_dependency build gd-devel Add_dependency build libexif-devel -post_install() -{ - install -d ${DESTDIR}/lib/udev/rules.d +post_install() { + # Remove unused udev helper + rm -rf ${pkgdir}/usr/lib/udev + vmkdir lib/udev/rules.d LD_LIBRARY_PATH="${DESTDIR}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ CAMLIBS="${DESTDIR}/usr/lib/libgphoto2/${version}" \ - "${DESTDIR}/usr/lib/libgphoto2/print-camera-list" \ - udev-rules version 136 group plugdev mode 0660 > \ - "${DESTDIR}/lib/udev/rules.d/54-gphoto.rules" + "${DESTDIR}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 > \ + "${DESTDIR}/lib/udev/rules.d/40-gphoto.rules" + + # Remove recursive symlink + rm -f ${DESTDIR}/usr/include/gphoto2/gphoto2 + install -d ${DESTDIR}/lib/udev/rules.d }