Date: Friday, September 10, 2010 @ 14:11:27 Author: andrea Revision: 90328
upgpkg: system-config-printer 1.2.4-2 use proper way to build; python2 transition Modified: system-config-printer/trunk/PKGBUILD ----------+ PKGBUILD | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-09-10 17:08:21 UTC (rev 90327) +++ PKGBUILD 2010-09-10 18:11:27 UTC (rev 90328) @@ -5,12 +5,12 @@ pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('any') license=('GPL') -makedepends=('intltool' 'python' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2') +makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2') source=("http://cyberelk.net/tim/data/${pkgbase}/1.2/${pkgbase}-${pkgver}.tar.bz2") md5sums=('cf7b45043c25bd32a0437346abf45a0e') @@ -21,7 +21,7 @@ --sbindir=/usr/bin \ --sysconfdir=/etc \ --disable-nls - make + python2 setup.py build } package_system-config-printer-common() { @@ -30,7 +30,7 @@ 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') - provides=("system-config-printer=$pkgver") + provides=("system-config-printer=${pkgver}") conflicts=('system-config-printer') cd ${srcdir}/${pkgbase}-${pkgver} @@ -55,10 +55,10 @@ install -m644 newprinternotification.conf \ ${pkgdir}/etc/dbus-1/system.d/ - for file in build/lib/cupshelpers/*.py; do - install -Dm644 $file \ - ${pkgdir}/usr/lib/python2.6/site-packages/cupshelpers/$(basename $file) - done + python2 setup.py install --root="${pkgdir}" + + # fix python 2.7 path + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' } package_system-config-printer-gnome() { @@ -66,8 +66,9 @@ depends=('system-config-printer-common' 'gnome-python' 'gnome-icon-theme' 'pygobject' 'pygtk' 'libxml2' 'python-notify') cd ${srcdir}/${pkgbase}-${pkgver} - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install + # files provided by system-config-printer-common cd ${pkgdir}/usr/share/${pkgbase} rm config.py \ debug.py \ @@ -82,5 +83,5 @@ XmlHelper.py \ pysmb.py rm ${pkgdir}/etc/dbus-1/system.d/newprinternotification.conf - rm -r ${pkgdir}/usr/lib/python2.6/site-packages/cupshelpers/ + rm -r ${pkgdir}/usr/lib/ }