summaryrefslogtreecommitdiff
path: root/extra/system-config-printer
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-02 21:25:54 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-06-02 21:25:54 -0300
commit8b9ddc7fec12ba69e50ece961525c90bed96df99 (patch)
treefc12914f9d27317b3d3f1df6f0009f02ebb7668a /extra/system-config-printer
parent40134114ddb57a36863a256ffdc5b65a8edb5a67 (diff)
parentd915cad658736d96368750201c34df752048751a (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-testing/perl-berkeleydb/PKGBUILD community/egoboo/PKGBUILD community/kdenlive/PKGBUILD community/postgis/PKGBUILD core/lvm2/PKGBUILD extra/gvfs/PKGBUILD extra/libatasmart/PKGBUILD extra/mesa/PKGBUILD extra/pixman/PKGBUILD extra/pulseaudio/PKGBUILD extra/system-config-printer/PKGBUILD extra/xorg-server/PKGBUILD kde-unstable/kdenetwork/PKGBUILD multilib/lib32-mesa/PKGBUILD testing/imagemagick/PKGBUILD testing/php/PKGBUILD testing/php/logrotate.d.php-fpm testing/php/php-fpm.conf.in.patch testing/php/rc.d.php-fpm testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/system-config-printer')
-rw-r--r--extra/system-config-printer/PKGBUILD12
1 files changed, 8 insertions, 4 deletions
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index f4cff20bb..117f5a583 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 155747 2012-04-06 00:06:00Z tomegun $
+# $Id: PKGBUILD 160371 2012-06-01 12:58:45Z dreisner $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=system-config-printer
pkgname=('system-config-printer-common'
'system-config-printer-gnome')
pkgver=1.3.9
-pkgrel=2
+pkgrel=3
pkgdesc="A CUPS printer configuration tool and status applet"
url="http://cyberelk.net/tim/software/system-config-printer/"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libusb-compat')
+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})
md5sums=('df424f127eede63965608e5ec5e27519'
'd105b7f7725c1ec538b6e6adb10667f3')
@@ -21,7 +22,10 @@ build() {
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
+ sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
+
+ # Fix build with udev 183
+ sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c
./configure --prefix=/usr \
--sbindir=/usr/bin \