Date: Thursday, March 8, 2012 @ 18:18:16 Author: tomegun Revision: 152699
upgpkg: libgphoto2 2.4.13-1 upstream update add libusb1 support (in addition to the old libusb-compat) don't delete .a files, as they don't exist remove some noop ./configure options remove the udev helper as it is no longer used by any udev rule this means libgphoto2 don't have to be rebuilt when udev moves from /lib to /usr/lib remove support for the 'camera' group (as discussed on irc) this is not needed as consolekit/systemd applies acl to cameras in the same way as everything else (audio, video,...), also it it is suggested by upstream not to use the group Modified: libgphoto2/trunk/PKGBUILD libgphoto2/trunk/libgphoto2.install --------------------+ PKGBUILD | 19 ++++++++++++------- libgphoto2.install | 18 ++++-------------- 2 files changed, 16 insertions(+), 21 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-03-08 22:08:05 UTC (rev 152698) +++ PKGBUILD 2012-03-08 23:18:16 UTC (rev 152699) @@ -1,23 +1,26 @@ # $Id$ -# Maintainer: Eduardo Romero <[email protected]> +# Maintainer: Jan de Groot <[email protected]> +# Contributor: Tom Gundersen <[email protected]> +# Contributor: Eduardo Romero <[email protected]> # Contributor: Damir Perisa <[email protected]> pkgname=libgphoto2 -pkgver=2.4.11 +pkgver=2.4.13 pkgrel=1 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64) url="http://www.gphoto.org"; license=(LGPL) -depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat') +depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb') install=libgphoto2.install options=('libtool') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz) -md5sums=('a2230c31e320acb7ececd90bc02fe515') build() { cd "${srcdir}/${pkgname}-${pkgver}" - udevscriptdir=/lib/udev ./configure --prefix=/usr --with-drivers=all --disable-static --disable-rpath + ./configure \ + --prefix=/usr \ + --disable-rpath make } @@ -25,14 +28,16 @@ cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - rm -f ${pkgdir}/usr/lib/libgphoto2/${pkgver}/*.a + # Remove unused udev helper + rm -rf "${pkgdir}/usr/lib/udev" 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}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 > \ "${pkgdir}/lib/udev/rules.d/40-gphoto.rules" # Remove recursive symlink rm -f "${pkgdir}/usr/include/gphoto2/gphoto2" } +md5sums=('7d8a1d3ae02069af381f07a0bb4bfc15') Modified: libgphoto2.install =================================================================== --- libgphoto2.install 2012-03-08 22:08:05 UTC (rev 152698) +++ libgphoto2.install 2012-03-08 23:18:16 UTC (rev 152699) @@ -1,16 +1,6 @@ -post_install() { - getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera - /bin/cat <<THEEND -NOTE ----- -Add your user to group 'camera' to use camera devices. -THEEND -} - post_upgrade() { - getent group camera >/dev/null || usr/sbin/groupadd -g 97 camera +if [ "$(vercmp $2 2.14.13)" -lt 0 ]; then + groupdel camera &>/dev/null + echo "Users no longer need to be in the 'camera' group to use camera devices" +fi } - -post_remove() { - usr/sbin/groupdel camera &>/dev/null -}
