diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-01-30 12:51:06 +0100 |
| commit | e8a18157bce8e0b0cbde5bd52aaf5ae0940297d3 (patch) | |
| tree | 89fc1343a6302c7ee5d72774fde0f5b67d0b1927 /extra/kdeadmin | |
| parent | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (diff) | |
| parent | 39711f3264d3b9de2ff6392649274d6333932457 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/arpack/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeadmin/PKGBUILD
extra/kdelibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
staging/digikam/PKGBUILD
testing/curl/PKGBUILD
Diffstat (limited to 'extra/kdeadmin')
| -rw-r--r-- | extra/kdeadmin/PKGBUILD | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index cc0569aae..9b18fe122 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145767 2011-12-30 10:33:07Z andrea $ +# $Id: PKGBUILD 147816 2012-01-28 10:33:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,17 +7,16 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.7.4 -pkgrel=2 +pkgver=4.8.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeadmin') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' - 'system-config-printer-common') +makedepends=('cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'syslog-path.patch') -sha1sums=('1a294315645adbbff348a380196d4300a408b70d' +sha1sums=('a7cf29130bd83615bdc01f54a465cef8c492c527' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { @@ -74,6 +73,9 @@ package_kdeadmin-system-config-printer-kde() { cd $srcdir/build/system-config-printer-kde make DESTDIR=$pkgdir install - # Use the python2 executable - find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/{system-config-printer-kde,authconn}.py + sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + "${pkgdir}"/usr/share/apps/system-config-printer-kde/pysmb.py } |