diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-09 00:41:55 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-09 00:41:55 -0700 |
| commit | 648599b08776ea788a3ddb0365eb30fda03efe7b (patch) | |
| tree | be3c375c8606fce5d85bbfc9095a2489c257ec68 /extra/system-config-printer | |
| parent | d6413cd6dac778aa64e48046ce7110000997ff61 (diff) | |
Thu May 9 00:41:55 PDT 2013
Diffstat (limited to 'extra/system-config-printer')
| -rw-r--r-- | extra/system-config-printer/PKGBUILD | 27 | ||||
| -rw-r--r-- | extra/system-config-printer/fix-typo-in-service.patch | 18 |
2 files changed, 12 insertions, 33 deletions
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 5d3794597..953e9d099 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 178008 2013-02-13 13:30:36Z andrea $ +# $Id: PKGBUILD 184759 2013-05-07 22:59:56Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@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 \ diff --git a/extra/system-config-printer/fix-typo-in-service.patch b/extra/system-config-printer/fix-typo-in-service.patch deleted file mode 100644 index 56f17dcec..000000000 --- a/extra/system-config-printer/fix-typo-in-service.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001 -From: Tim Waugh <twaugh@redhat.com> -Date: Tue, 23 Oct 2012 13:55:12 +0000 -Subject: Fixed typo in systemd config file. - ---- -diff --git a/udev/configure-printer@.service.in b/udev/configure-printer@.service.in -index 8a20967..5898c79 100644 ---- a/udev/configure-printer@.service.in -+++ b/udev/configure-printer@.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 |