[arch-commits] CVS update of extra/lib/libgphoto2 (PKGBUILD)

[Tobias Powalowski]

    Date: Monday, November 19, 2007 @ 01:49:42
  Author: tpowa
    Path: /home/cvs-extra/extra/lib/libgphoto2

Modified: PKGBUILD (1.29 -> 1.30)

'upgpkg: http://bugs.archlinux.org/task/8701'


----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)


Index: extra/lib/libgphoto2/PKGBUILD
diff -u extra/lib/libgphoto2/PKGBUILD:1.29 extra/lib/libgphoto2/PKGBUILD:1.30
--- extra/lib/libgphoto2/PKGBUILD:1.29	Sun Nov 18 10:58:40 2007
+++ extra/lib/libgphoto2/PKGBUILD	Mon Nov 19 01:49:42 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.29 2007/11/18 15:58:40 tpowa Exp $
+# $Id: PKGBUILD,v 1.30 2007/11/19 06:49:42 tpowa Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=libgphoto2
 pkgver=2.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="The core of gphoto2 software. It is a portable library to gives access to more than 400 digital cameras."
 arch=(i686 x86_64)
 url="http://www.gphoto.org"
@@ -12,8 +12,7 @@
 license=(LGPL)
 install=(libgphoto2.install)
 source=(http://heanet.dl.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz
-	no-mdns.patch)
-md5sums=('adef1a564d3d1a48e1c13ece34b111b6' '28f57616cbba6f12ca113b87c8123993')
+	no-mdns.patch fix-udev.patch)
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
@@ -42,9 +41,12 @@
   CAMLIBS="${startdir}/pkg/usr/lib/libgphoto2/${pkgver}" \
       ${startdir}/pkg/usr/lib/libgphoto2/print-camera-list udev-rules version 0.98 group camera mode 0660 > \
       ${startdir}/pkg/etc/udev/rules.d/54-gphoto.rules
-
-  # fix usb subsystem for 2.6.23 kernel
-  sed -i -e 's/usb_device/usb/g' ${startdir}/pkg/etc/udev/rules.d/54-gphoto.rules
   mkdir ${startdir}/pkg/lib
   mv ${startdir}/pkg/usr/lib/udev ${startdir}/pkg/lib/
+  # fix usb and usb_device subsystems
+  cd ${startdir}/pkg/etc/udev/rules.d/
+  patch -Np0 -i ${startdir}/src/fix-udev.patch || return 1
 }
+md5sums=('adef1a564d3d1a48e1c13ece34b111b6'
+         '28f57616cbba6f12ca113b87c8123993'
+         'e5f3b19f7cdca8d72190170da995dfec')