extra/cups to 2.2.10-2

extra/cups/PKGBUILD

@@ -6,7 +6,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=2.2.10
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 license=('GPL')
 url="https://www.cups.org/"
@@ -82,7 +82,8 @@ build() {
      --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\
@@ -117,7 +118,6 @@ backup=(etc/cups/cupsd.conf
         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'
@@ -157,6 +157,11 @@ optdepends=('xdg-utils: xdg .desktop file support'
   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