summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Husmann2015-08-30 23:23:00 +0200
committerStefan Husmann2015-08-30 23:23:00 +0200
commita6967a7d9de7b72941e0bdada061fd90577f12b3 (patch)
treeecccdcb18916578a47014404a770e0a3e7ca7934
parent345ff81cec250a3ec47bb78b9700b178a7a5c664 (diff)
downloadaur-a6967a7d9de7b72941e0bdada061fd90577f12b3.tar.gz
fix conflicts
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD18
2 files changed, 19 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 482e1622773..9d5963e68b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = uzbl-next-git
- pkgver = 2012.05.14.1189.g3ea76c2
- pkgrel = 2
+ pkgver = 2012.05.14.1234.gb89e710
+ pkgrel = 1
url = http://www.uzbl.org
arch = i686
arch = x86_64
@@ -27,12 +27,11 @@ pkgname = uzbl-core-next-git
pkgname = uzbl-browser-next-git
pkgdesc = A complete browser experience based on uzbl-core
install = uzbl.install
- depends = uzbl-core-next-git=2012.05.14.1189.g3ea76c2
+ arch = any
+ depends = uzbl-core-next-git=2012.05.14.1234.gb89e710
depends = desktop-file-utils
- depends = cairo
depends = python
depends = python2
- depends = webkitgtk
provides = uzbl-browser
conflicts = uzbl-browser
diff --git a/PKGBUILD b/PKGBUILD
index c51a6f3149e..4e42b51ffdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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() {