Sat Feb 9 00:07:22 PST 2013

1 files changed, 16 insertions, 87 deletions

diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 232d3d2b4..0156783e5 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 176979 2013-02-03 10:02:30Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 177777 2013-02-08 12:50:50Z andrea $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
-pkgbase=system-config-printer
-pkgname=('system-config-printer-common'
-         'system-config-printer-gnome')
+pkgname=system-config-printer
 pkgver=1.3.12
-pkgrel=3
+pkgrel=1
 pkgdesc="A CUPS printer configuration tool and status applet"
 url="http://cyberelk.net/tim/software/system-config-printer/"
 arch=('i686' 'x86_64')
 license=('GPL')
-makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl'
-             'libusb-compat' 'desktop-file-utils')
-source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
+depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
+         'gnome-icon-theme' 'python2-notify')
+makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
+optdepends=('gnome-keyring: password management')
+replaces=('system-config-printer-common' 'system-config-printer-gnome')
+conflicts=('system-config-printer-common' 'system-config-printer-gnome')
+source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig})
 md5sums=('0775647e1c34ef25364de3c178a4ed36'
          '1aa2246047b424e2d23473749368b8c6')
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd ${pkgname}-${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
 
-  ./configure --prefix=/usr \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \
     --with-udev-rules
@@ -32,81 +35,7 @@ build() {
   make
 }
 
-package_system-config-printer-common() {
-  pkgdesc='Pygtk CUPS Configuration'
-  depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat')
-  optdepends=('system-config-printer-gnome: for the GTK frontend'
-	'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
-  replaces=('system-config-printer')
-  provides=("system-config-printer=${pkgver}")
-  conflicts=('system-config-printer')
-
-  cd ${pkgbase}-${pkgver}
-  install -d "${pkgdir}"/usr/share/${pkgbase}
-  install -m644 config.py \
-    debug.py \
-    installpackage.py \
-    monitor.py \
-    PhysicalDevice.py \
-    ppdippstr.py \
-    probe_printer.py \
-    SearchCriterion.py \
-    smburi.py \
-    statereason.py \
-    "${pkgdir}"/usr/share/${pkgbase}/
-
-  install -m755 pysmb.py \
-    "${pkgdir}"/usr/share/${pkgbase}/
-
-  install -d "${pkgdir}"/etc/dbus-1/system.d/
-  install -m644 dbus/com.redhat.NewPrinterNotification.conf \
-    dbus/com.redhat.PrinterDriversInstaller.conf \
-    "${pkgdir}"/etc/dbus-1/system.d/
-
-  install -d "${pkgdir}"/usr/share/dbus-1/{services,interfaces}
-  install -m644 dbus/org.fedoraproject.Config.Printing.service \
-    "${pkgdir}"/usr/share/dbus-1/services/
-  install -m644 dbus/org.fedoraproject.Config.Printing.xml \
-    "${pkgdir}"/usr/share/dbus-1/interfaces/
-  install -d "${pkgdir}"/etc/cupshelpers/
-  install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
-
-  install -d "${pkgdir}"/usr/lib/udev/rules.d
-  install -m755 udev/{udev-add-printer,udev-configure-printer} \
-    "${pkgdir}"/usr/lib/udev/
-  install -m644 udev/70-printers.rules \
-    "${pkgdir}"/usr/lib/udev/rules.d
-
-  for file in build/lib/cupshelpers/*.py; do
-    install -Dm644 $file \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
-  done
-}
-
-package_system-config-printer-gnome() {
-  pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend'
-  depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify')
-  optdependence=('gnome-keyring: password management')
-
-  cd ${pkgbase}-${pkgver}
+package() {
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
-
-  # files provided by system-config-printer-common
-  cd "${pkgdir}"/usr/share/${pkgbase}
-  rm config.py \
-    debug.py \
-    installpackage.py \
-    monitor.py \
-    PhysicalDevice.py \
-    ppdippstr.py \
-    probe_printer.py \
-    SearchCriterion.py \
-    smburi.py \
-    statereason.py \
-    pysmb.py
-  rm -r "${pkgdir}"/etc/dbus-1/
-  rm -r "${pkgdir}"/etc/cupshelpers/
-  rm -r "${pkgdir}"/etc/udev/
-  rm -r "${pkgdir}"/usr/share/dbus-1/
-  rm -r "${pkgdir}"/usr/lib/
 }