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

[Felix Yan]

    Date: Thursday, February 21, 2019 @ 19:30:57
  Author: felixonmars
Revision: 435125

upgpkg: zbar 0.21-2

- fix file confliction (FS#61815)
- fix dbus file location

Modified:
  zbar/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-21 19:27:11 UTC (rev 435124)
+++ PKGBUILD	2019-02-21 19:30:57 UTC (rev 435125)
@@ -6,7 +6,7 @@
 pkgbase=zbar
 pkgname=(zbar zbar-gtk zbar-qt python2-zbar)
 pkgver=0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Application and library for reading bar codes from various sources"
 arch=('x86_64')
 url="https://github.com/mchehab/zbar"
@@ -33,11 +33,14 @@
 }
 
 package_zbar() {
-  depends=('libmagick' 'libsm' 'libxv' 'v4l-utils')
+  depends=('dbus' 'libmagick' 'libsm' 'libxv' 'v4l-utils')
 
   cd zbar-$pkgver
   make DESTDIR="$pkgdir" install
 
+  install -dm755 "$pkgdir"/usr/share/dbus-1/system.d
+  mv "$pkgdir"{/etc,/usr/share}/dbus-1/system.d/org.linuxtv.Zbar.conf
+
   rm -r "$pkgdir"/usr/lib/libzbar{gtk,qt}.so* \
         "$pkgdir"/usr/lib/*.a \
         "$pkgdir"/usr/include/zbar/zbargtk.h \
@@ -45,6 +48,8 @@
         "$pkgdir"/usr/lib/pkgconfig/zbar-{gtk,qt}.pc \
         "$pkgdir"/usr/lib/python2.7 \
         "$pkgdir"/usr/bin/zbarcam-*
+
+  rmdir "$pkgdir"/etc{/dbus-1/system.d,/dbus-1,}
 }
 
 package_zbar-gtk() {
@@ -62,7 +67,8 @@
         "$pkgdir"/usr/lib/pkgconfig/zbar{,-qt}.pc \
         "$pkgdir"/usr/lib/python2.7 \
         "$pkgdir"/usr/share \
-        "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt}
+        "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-qt} \
+        "$pkgdir"/etc
 
   mv ./zbargtk.h "$pkgdir"/usr/include/zbar/
 }
@@ -82,7 +88,8 @@
         "$pkgdir"/usr/lib/pkgconfig/zbar{,-gtk}.pc \
         "$pkgdir"/usr/lib/python2.7 \
         "$pkgdir"/usr/share \
-        "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk}
+        "$pkgdir"/usr/bin/{zbarimg,zbarcam,zbarcam-gtk} \
+        "$pkgdir"/etc
 
   mv ./QZBar*.h "$pkgdir"/usr/include/zbar/
 }
@@ -96,7 +103,8 @@
   rm -r "$pkgdir"/usr/lib/*.so* \
         "$pkgdir"/usr/include \
         "$pkgdir"/usr/lib/pkgconfig \
-        "$pkgdir"/usr/{bin,share}
+        "$pkgdir"/usr/{bin,share} \
+        "$pkgdir"/etc
 }
 
 # vim:set ts=2 sw=2 et: