diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-09-05 10:33:48 +0200 |
| commit | 4a133169d99e3d760caad3cbca2781872f4a0805 (patch) | |
| tree | 73d442004d2d4f70e0194bd78d6b293337ec2456 /community/apper/PKGBUILD | |
| parent | a420f5c4c2a4eeb411175d086b339b620dba309d (diff) | |
| parent | 58f5e0b164b5f4c9af61b2e42bd10c85f28b9bed (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apcupsd/PKGBUILD
community/freedroidrpg/PKGBUILD
community/lincity-ng/PKGBUILD
community/python2-pymongo/PKGBUILD
core/openssh/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/gnutls/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib/chuck/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-sdl/PKGBUILD
multilib/wine/PKGBUILD
social/monkeysphere/PKGBUILD
testing/cups/PKGBUILD
testing/cups/cups-systemd-socket.patch
testing/cups/cups.install
testing/inetutils/PKGBUILD
testing/inetutils/ftpd.service
testing/libreoffice/PKGBUILD
testing/libreoffice/libreoffice-common.csh
testing/libreoffice/libreoffice-common.sh
testing/modemmanager/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.service
testing/openssh/sshd.socket
testing/upower/PKGBUILD
Diffstat (limited to 'community/apper/PKGBUILD')
| -rw-r--r-- | community/apper/PKGBUILD | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD index 361d3e90c..9740ac8aa 100644 --- a/community/apper/PKGBUILD +++ b/community/apper/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75748 2012-08-30 17:50:49Z idevolder $ +# $Id: PKGBUILD 75865 2012-09-03 20:25:45Z idevolder $ # Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Zom <zom@eevul.org> @@ -6,7 +6,7 @@ pkgname=apper _pkgmainver=0.7 pkgver=0.7.2 -pkgrel=4 +pkgrel=5 pkgdesc="KDE tools for PackageKit" arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/Apper?content=84745" @@ -15,7 +15,7 @@ depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17') makedepends=('cmake' 'automoc4' 'chrpath') install="$pkgname.install" provides=('kpackagekit') -conflicts=('kpackagekit' 'gnome-packagekit') +conflicts=('kpackagekit') replaces=('kpackagekit') source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2") sha256sums=('975fede728e7ab96d8e244ae721a2e15ae40b9fb1cd189a1f4afd46c400b219f') @@ -36,6 +36,9 @@ package() { cd "$pkgname-$pkgver" cd build make DESTDIR="$pkgdir" install + # avoid gnome-packagekit conflict (stolen from fedora as suggested) + mv "$pkgdir/usr/share/dbus-1/services/org.freedesktop.PackageKit.service" \ + "$pkgdir/usr/share/dbus-1/services/kde-org.freedesktop.PackageKit.service" # Hack around cmake rpath bug (debian) chrpath --list "$pkgdir/usr/bin/apper" chrpath --replace "/usr/lib/apper" "$pkgdir/usr/bin/apper" |