[arch-commits] Commit in system-config-printer/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Saturday, February 2, 2013 @ 18:50:45
  Author: andrea
Revision: 176921

upgpkg: system-config-printer 1.3.12-2

Move the scp-dbus-service binary to the -common package as it is needed by KDE too

Modified:
  system-config-printer/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-02 17:42:32 UTC (rev 176920)
+++ PKGBUILD	2013-02-02 17:50:45 UTC (rev 176921)
@@ -5,7 +5,7 @@
 pkgname=('system-config-printer-common'
          'system-config-printer-gnome')
 pkgver=1.3.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64')
@@ -17,16 +17,13 @@
          '1aa2246047b424e2d23473749368b8c6')
 
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
 
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
   sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
 
-  # Fix build with udev 183
-  sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c
-
   ./configure --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
@@ -44,7 +41,7 @@
   provides=("system-config-printer=${pkgver}")
   conflicts=('system-config-printer')
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   install -d "${pkgdir}"/usr/share/${pkgbase}
   install -m644 config.py \
     debug.py \
@@ -84,6 +81,9 @@
     install -Dm644 $file \
       "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
   done
+  
+  install -Dm755 dbus/scp-dbus-service \
+    "${pkgdir}"/usr/bin/scp-dbus-service
 }
 
 package_system-config-printer-gnome() {
@@ -91,10 +91,11 @@
   depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify')
   optdependence=('gnome-keyring: password management')
 
-  cd "${srcdir}"/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   # files provided by system-config-printer-common
+  rm "${pkgdir}"/usr/bin/scp-dbus-service
   cd "${pkgdir}"/usr/share/${pkgbase}
   rm config.py \
     debug.py \