[arch-commits] Commit in system-config-printer/trunk (PKGBUILD no-packagekit.patch)

[Eric Bélanger]

    Date: Wednesday, October 12, 2011 @ 00:35:11
  Author: eric
Revision: 140388

upgpkg: system-config-printer 1.3.7-1

Upstream update, Add udev depends and makedepends, Remove old patch

Modified:
  system-config-printer/trunk/PKGBUILD
Deleted:
  system-config-printer/trunk/no-packagekit.patch

---------------------+
 PKGBUILD            |   17 +++++++----------
 no-packagekit.patch |   36 ------------------------------------
 2 files changed, 7 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-12 02:51:45 UTC (rev 140387)
+++ PKGBUILD	2011-10-12 04:35:11 UTC (rev 140388)
@@ -4,23 +4,20 @@
 pkgbase=system-config-printer
 pkgname=('system-config-printer-common'
 	'system-config-printer-gnome')
-pkgver=1.3.5
-pkgrel=2
+pkgver=1.3.7
+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=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
-source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz"
-        'no-packagekit.patch')
-md5sums=('9d806643f17dc65a492a1d4e8a60f2ec'
-         'e70a274c3cced39db1668e2a748e068f')
+makedepends=('udev' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
+source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
+md5sums=('f579ba287403d8ae3028377c6641feed'
+         'a2ce58f4e612130b30e5c029e9afd31f')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
 
-  patch -p1 -i "${srcdir}"/no-packagekit.patch
-  
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
@@ -36,7 +33,7 @@
 
 package_system-config-printer-common() {
   pkgdesc='Pygtk CUPS Configuration'
-  depends=('pycups' 'dbus-python' 'pysmbc')
+  depends=('udev' 'pycups' 'dbus-python' 'pysmbc')
   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')

Deleted: no-packagekit.patch
===================================================================
--- no-packagekit.patch	2011-10-12 02:51:45 UTC (rev 140387)
+++ no-packagekit.patch	2011-10-12 04:35:11 UTC (rev 140388)
@@ -1,36 +0,0 @@
---- system-config-printer-1.3.5/cupshelpers/cupshelpers.py	2011-08-01 10:47:11.614519332 +0100
-+++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py	2011-08-02 15:45:33.807623959 +0100
-@@ -21,7 +21,6 @@
- 
- import cups, pprint, os, tempfile, re, string
- import locale
--import packagekit.client, packagekit.enums
- from . import _debugprint
- 
- class Printer:
-@@ -829,24 +828,7 @@
-     missing executables
-     """
-     executables = missingExecutables(ppd)
--    packages = []
--    if executables:
--        unresolved_executables = []
--        client = packagekit.client.PackageKitClient ()
--        for executable in executables:
--            if not executable.startswith ("/"):
--                executable = "/usr/bin/" + executable
--
--            result = client.search_file ([executable],
--                                         packagekit.enums.FILTER_NOT_INSTALLED)
--            if result:
--                packages.extend (set (map (lambda x: x.name, result)))
--            else:
--                unresolved_executables.append (executable)
--
--        executables = unresolved_executables
--        
--    return (packages, executables)
-+    return ([], executables)
- 
- def _main():
-     c = cups.Connection()