diff options
author | Stefan Husmann | 2015-08-30 23:23:00 +0200 |
---|---|---|
committer | Stefan Husmann | 2015-08-30 23:23:00 +0200 |
commit | a6967a7d9de7b72941e0bdada061fd90577f12b3 (patch) | |
tree | ecccdcb18916578a47014404a770e0a3e7ca7934 /PKGBUILD | |
parent | 345ff81cec250a3ec47bb78b9700b178a7a5c664 (diff) | |
download | aur-a6967a7d9de7b72941e0bdada061fd90577f12b3.tar.gz |
fix conflicts
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -1,8 +1,8 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgbase=uzbl-next-git -pkgrel=2 +pkgrel=1 pkgname=('uzbl-core-next-git' 'uzbl-browser-next-git' 'uzbl-tabbed-next-git') -pkgver=2012.05.14.1189.g3ea76c2 +pkgver=2012.05.14.1234.gb89e710 arch=('i686' 'x86_64') url="http://www.uzbl.org" license=('GPL3') @@ -52,14 +52,26 @@ package_uzbl-core-next-git() { package_uzbl-browser-next-git() { install=uzbl.install + arch=('any') pkgdesc="A complete browser experience based on uzbl-core" depends=("uzbl-core-next-git=$pkgver" - 'desktop-file-utils' 'cairo' 'python' 'python2' 'webkitgtk') + 'desktop-file-utils' 'python' 'python2') provides=('uzbl-browser') conflicts=('uzbl-browser') install -d $pkgdir/usr/share/appdata cd "$srcdir/$_gitname" make DESTDIR="$pkgdir/" PREFIX=/usr install install-uzbl-browser + # avoid conflicts + rm -f $pkgdir/usr/bin/uzbl-core \ + $pkgdir/usr/share/man/man1/uzbl-core.1.gz \ + $pkgdir/usr/share/uzbl/docs/AUTHORS \ + $pkgdir/usr/share/uzbl/docs/COMMUNITY.md \ + $pkgdir/usr/share/uzbl/docs/CONTRIBUTING.md \ + $pkgdir/usr/share/uzbl/docs/FAQ.md \ + $pkgdir/usr/share/uzbl/docs/INSTALL.md \ + $pkgdir/usr/share/uzbl/docs/README.md \ + $pkgdir/usr/share/uzbl/docs/config.h \ + $pkgdir/usr/bin/uzbl-tabbed } package_uzbl-tabbed-next-git() { |