diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
commit | 80c5e58be137999f5d9690b682e888436ffe69b2 (patch) | |
tree | 5aef91b2cbc21ef5471d9ab69066ba7beaf747f0 /extra/kdeadmin | |
parent | 9866fa59a35ebbae88bec725eba8551f34990e03 (diff) | |
parent | e9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-dataenc/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
core/openssl/PKGBUILD
extra/cabal-install/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/kdebindings-python/PKGBUILD
Diffstat (limited to 'extra/kdeadmin')
-rw-r--r-- | extra/kdeadmin/PKGBUILD | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 3bd2da796..b232c618e 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 174665 2013-01-05 13:10:47Z andrea $ +# $Id: PKGBUILD 177660 2013-02-08 08:56:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=kdeadmin pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' - 'kdeadmin-kuser' - 'kdeadmin-system-config-printer-kde') -pkgver=4.9.5 + 'kdeadmin-kuser') +pkgver=4.10.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -15,7 +14,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('b67e2be133acd8e6de172480f562ef8f3bcf9f2d' +sha1sums=('d6f66f9a5d6a42b80e130654a62dfe61ce82dd94' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { @@ -27,10 +26,9 @@ build() { cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ + -DKDE4_BUILD_TESTS=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_strigi-analyzer=OFF \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 + -DBUILD_strigi-analyzer=OFF make } @@ -64,19 +62,3 @@ package_kdeadmin-kuser() { cd $srcdir/build/doc/kuser make DESTDIR=$pkgdir install } - -package_kdeadmin-system-config-printer-kde() { - pkgdesc='Configure local and remote Printers' - depends=('kdebindings-python2' 'system-config-printer-common' 'cups' 'python2-gobject2') - url="http://kde.org/applications/system/printerapplet/" - cd $srcdir/build/system-config-printer-kde - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/system-config-printer-kde - make DESTDIR=$pkgdir install - - # 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 -} |