[arch-commits] Commit in argyllcms/trunk (PKGBUILD)

[Timothy Redaelli]

    Date: Tuesday, March 11, 2014 @ 12:34:11
  Author: tredaelli
Revision: 107018

upgpkg: argyllcms 1.6.3-3

Proper fix for FS#39235

Modified:
  argyllcms/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-11 11:33:34 UTC (rev 107017)
+++ PKGBUILD	2014-03-11 11:34:11 UTC (rev 107018)
@@ -6,7 +6,7 @@
 _pkgname=Argyll
 pkgver=1.6.3
 _pkgver="V${pkgver}"
-pkgrel=2
+pkgrel=3
 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware"
 arch=(i686 x86_64)
 depends=('libxss' 'libxinerama' 'libxxf86vm' 'libxrandr')
@@ -18,6 +18,10 @@
 install=${pkgname}.install
 sha256sums=('188beaa03dd2459403415023f8f8f9aab362bf3062a9822b3622dde6902e4b84')
 
+prepare() {
+  sed -i 's:^TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p":IMPORT{builtin}="hwdb --subsystem=usb":' ${_pkgname}_${_pkgver}/usb/55-Argyll.rules
+}
+
 build() {
   cd ${_pkgname}_${_pkgver}
   echo "***running makeall.sh***"
@@ -43,15 +47,6 @@
   install -m644 ${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc
   mkdir -p "${pkgdir}"/usr/lib/udev/rules.d
   install -m644 ${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules
-  sed -i 's|^IMPORT{program}="usb|#IMPORT{program}="usb|' "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules
-  cat <<EOF >>"${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules
-
-# As mentioned in https://bugzilla.redhat.com/show_bug.cgi?id=859244 and https://bbs.archlinux.org/viewtopic.php?id=155589
-# I've commented out the line:
-# IMPORT{program}="usb-db %p"
-# to prevent the error messages:
-# systemd-udevd[242]: failed to execute '/usr/lib/udev/usb-db'...
-EOF
 }
 
 # vim:set ts=2 sw=2 et: