summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamran Mackey2015-12-14 19:40:03 -0700
committerKamran Mackey2015-12-14 19:40:03 -0700
commit458612f43e597eb93f0df5e25e7572c12245a6d0 (patch)
treee2baeffe20e51daf9036be5dee3d82312cff6ddc
parenta76ea8d9128f0296ca4991c8d0167798b3a8241d (diff)
downloadaur-458612f43e597eb93f0df5e25e7572c12245a6d0.tar.gz
Moved conflicts & provides to the split package function.
Signed-off-by: Kamran Mackey <kamranm1200@gmail.com>
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD8
2 files changed, 10 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8cd38e29672f..5c35bfe4bce6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Dec 15 02:35:30 UTC 2015
+# Tue Dec 15 02:39:59 UTC 2015
pkgbase = harfbuzz-git
pkgdesc = OpenType text shaping engine
pkgver = 1.1.2.r19.g15f2c05
- pkgrel = 4
+ pkgrel = 5
url = http://www.freedesktop.org/wiki/Software/HarfBuzz
arch = i686
arch = x86_64
@@ -14,10 +14,6 @@ pkgbase = harfbuzz-git
makedepends = cairo
makedepends = icu
makedepends = gobject-introspection
- provides = harfbuzz
- provides = harfbuzz-icu
- conflicts = harfbuzz
- conflicts = harfbuzz-icu
source = git://github.com/behdad/harfbuzz.git
sha256sums = SKIP
@@ -26,9 +22,12 @@ pkgname = harfbuzz-git
depends = freetype2
depends = graphite
optdepends = cairo: hb-view program
+ provides = harfbuzz
pkgname = harfbuzz-icu-git
pkgdesc = OpenType text shaping engine (ICU integration)
depends = harfbuzz
depends = icu
+ provides = harfbuzz-icu
+ conflicts = harfbuzz-icu
diff --git a/PKGBUILD b/PKGBUILD
index 2f5e87a9e4e4..e6cafb1953de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,12 @@
pkgbase=(harfbuzz-git)
pkgname=(harfbuzz-git harfbuzz-icu-git)
pkgver=1.1.2.r19.g15f2c05
-pkgrel=4
+pkgrel=5
pkgdesc="OpenType text shaping engine"
arch=(i686 x86_64)
url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
license=(MIT)
makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
-conflicts=(harfbuzz harfbuzz-icu)
-provides=(harfbuzz harfbuzz-icu)
source=(git://github.com/behdad/harfbuzz.git)
sha256sums=('SKIP')
_gitname=harfbuzz
@@ -46,6 +44,8 @@ check() {
package_harfbuzz-git() {
depends=(glib2 freetype2 graphite)
optdepends=('cairo: hb-view program')
+ conflcts=(harfbuzz)
+ provides=(harfbuzz)
cd "$_gitname"
make DESTDIR="$pkgdir" install
@@ -61,6 +61,8 @@ package_harfbuzz-git() {
package_harfbuzz-icu-git(){
pkgdesc="$pkgdesc (ICU integration)"
depends=(harfbuzz icu)
+ conflicts=(harfbuzz-icu)
+ provides=(harfbuzz-icu)
mv hb-icu/* "$pkgdir"