From 0bf564cf7a3d99207457267c75f92ceb67197537 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Feb 2013 00:04:52 -0800 Subject: Thu Feb 14 00:04:51 PST 2013 --- extra/system-config-printer/PKGBUILD | 13 +++++++++---- extra/system-config-printer/fix-typo-in-service.patch | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 extra/system-config-printer/fix-typo-in-service.patch (limited to 'extra/system-config-printer') diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 0156783e5..5d3794597 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177777 2013-02-08 12:50:50Z andrea $ +# $Id: PKGBUILD 178008 2013-02-13 13:30:36Z andrea $ # Maintainer: # Contributor: Andrea Scarpino pkgname=system-config-printer 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') @@ -15,13 +15,18 @@ 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}) +source=(http://cyberelk.net/tim/data/${pkgname}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig} + 'fix-typo-in-service.patch') md5sums=('0775647e1c34ef25364de3c178a4ed36' - '1aa2246047b424e2d23473749368b8c6') + '1aa2246047b424e2d23473749368b8c6' + 'd30d14aeb6d2bfeac0679d28704473ec') build() { 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') diff --git a/extra/system-config-printer/fix-typo-in-service.patch b/extra/system-config-printer/fix-typo-in-service.patch new file mode 100644 index 000000000..56f17dcec --- /dev/null +++ b/extra/system-config-printer/fix-typo-in-service.patch @@ -0,0 +1,18 @@ +From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001 +From: Tim Waugh +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 -- cgit v1.2.3-54-g00ecf