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

[Eric Bélanger]

    Date: Friday, May 3, 2013 @ 08:08:21
  Author: eric
Revision: 184174

upgpkg: system-config-printer 1.4.0-1

Upstream update, Update depends, Remove old patch

Modified:
  system-config-printer/trunk/PKGBUILD
Deleted:
  system-config-printer/trunk/fix-typo-in-service.patch

---------------------------+
 PKGBUILD                  |   25 +++++++++++--------------
 fix-typo-in-service.patch |   18 ------------------
 2 files changed, 11 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-03 04:42:56 UTC (rev 184173)
+++ PKGBUILD	2013-05-03 06:08:21 UTC (rev 184174)
@@ -3,35 +3,32 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=system-config-printer
-pkgver=1.3.12
-pkgrel=2
+pkgver=1.4.0
+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')
-depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
-         'gnome-icon-theme' 'python2-notify')
+depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
+         'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3')
 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}
-        'fix-typo-in-service.patch')
-md5sums=('0775647e1c34ef25364de3c178a4ed36'
-         '1aa2246047b424e2d23473749368b8c6'
-         'd30d14aeb6d2bfeac0679d28704473ec')
+source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('3267c2eac454f470c0659034196d2668'
+         'SKIP')
 
-build() {
+prepare() {
   cd ${pkgname}-${pkgver}
-
-  # Fixed upstream
-  patch -p1 -i "${srcdir}"/fix-typo-in-service.patch
-
   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
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
     --sbindir=/usr/bin \
     --sysconfdir=/etc \

Deleted: fix-typo-in-service.patch
===================================================================
--- fix-typo-in-service.patch	2013-05-03 04:42:56 UTC (rev 184173)
+++ fix-typo-in-service.patch	2013-05-03 06:08:21 UTC (rev 184174)
@@ -1,18 +0,0 @@
-From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh at redhat.com>
-Date: Tue, 23 Oct 2012 13:55:12 +0000
-Subject: Fixed typo in systemd config file.
-
----
-diff --git a/udev/configure-printer at .service.in b/udev/configure-printer at .service.in
-index 8a20967..5898c79 100644
---- a/udev/configure-printer at .service.in
-+++ b/udev/configure-printer at .service.in
-@@ -4,4 +4,4 @@ Requires=cups.socket
- After=cups.socket
- 
- [Service]
--ExecStart=@udevhelperdir@/configure-printer add "%i"
-+ExecStart=@udevhelperdir@/udev-configure-printer add "%i"
---
-cgit v0.9.1