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

[Andreas Radke]

    Date: Sunday, January 13, 2019 @ 20:53:01
  Author: andyrtr
Revision: 343997

upgpkg: cups 2.2.10-2

fix D-Bus policy location

Modified:
  cups/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-13 20:50:26 UTC (rev 343996)
+++ PKGBUILD	2019-01-13 20:53:01 UTC (rev 343997)
@@ -3,7 +3,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=2.2.10
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('GPL')
 url="https://www.cups.org/"
@@ -80,7 +80,8 @@
      --with-cups-group=209 \
      --enable-pam=yes \
      --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 \
+     --enable-dbus=yes \
+     --with-dbusdir=/usr/share/dbus-1 \
      --enable-ssl=yes \
      --enable-threads \
      --enable-avahi\
@@ -115,7 +116,6 @@
         etc/cups/classes.conf
         etc/cups/cups-files.conf
         etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
         etc/logrotate.d/cups
         etc/pam.d/cups)
 depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc'
@@ -155,6 +155,11 @@
   touch ${pkgdir}/etc/cups/subscriptions.conf
   chgrp -R 209 ${pkgdir}/etc/cups
 
+  # fix dbus policy location - --with-dbusdir doens't work
+  install -dm755 ${pkgdir}/usr/share/dbus-1/system.d
+  mv ${pkgdir}/etc/dbus-1/system.d/cups.conf ${pkgdir}/usr/share/dbus-1/system.d
+  rm -rf ${pkgdir}/etc/dbus-1
+
   # fix .desktop file
   sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop