[arch-commits] Commit in libgphoto2/trunk (PKGBUILD libgphoto2.install)

[Jan de Groot]

    Date: Monday, January 27, 2014 @ 09:48:42
  Author: jgc
Revision: 204789

Replace udev rules with hwdb file
upgpkg: libgphoto2 2.5.3.1-1

Modified:
  libgphoto2/trunk/PKGBUILD
  libgphoto2/trunk/libgphoto2.install

--------------------+
 PKGBUILD           |   15 ++++++++-------
 libgphoto2.install |   16 ++++++++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-27 08:27:19 UTC (rev 204788)
+++ PKGBUILD	2014-01-27 08:48:42 UTC (rev 204789)
@@ -5,8 +5,8 @@
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=libgphoto2
-pkgver=2.5.2
-pkgrel=2
+pkgver=2.5.3.1
+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"
@@ -14,8 +14,9 @@
 depends=('libexif' 'libjpeg' 'gd' 'libltdl' 'libusb')
 install=libgphoto2.install
 options=('libtool')
-source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d9f4462957e59bf2b2eb3b1ea8423570')
+source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('aad2607a84442769c14f6acce2ca1ddf'
+         'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,11 +33,11 @@
   # Remove unused udev helper
   rm -rf "${pkgdir}/usr/lib/udev"
 
-  install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
+  install -m755 -d "${pkgdir}/usr/lib/udev/hwdb.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 175 > \
-      "${pkgdir}/usr/lib/udev/rules.d/40-gphoto.rules"
+      "${pkgdir}/usr/lib/libgphoto2/print-camera-list" hwdb > \
+      "${pkgdir}/usr/lib/udev/hwdb.d/20-gphoto.conf"
 
   # Remove recursive symlink
   rm -f "${pkgdir}/usr/include/gphoto2/gphoto2"

Modified: libgphoto2.install
===================================================================
--- libgphoto2.install	2014-01-27 08:27:19 UTC (rev 204788)
+++ libgphoto2.install	2014-01-27 08:48:42 UTC (rev 204789)
@@ -1,6 +1,14 @@
+post_install() {
+  udevadm hwdb --update
+}
 post_upgrade() {
-if [ "$(vercmp $2 2.4.13)" -lt 0 ]; then
-  groupdel camera &>/dev/null
-  echo "Users no longer need to be in the 'camera' group to use camera devices"
-fi
+  if [ "$(vercmp $2 2.4.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_install
 }
+
+post_remove() {
+  post_install
+}