Add conflicts and provides

2 files changed, 10 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94c43d18120d..13afd6974c79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = st-solarized-dark
 	pkgdesc = A simple virtual terminal emulator for X. Patched for solarized dark and Inconsolata font.
 	pkgver = 0.7
-	pkgrel = 2
+	pkgrel = 3
 	url = http://st.suckless.org
 	arch = i686
 	arch = x86_64
@@ -9,6 +9,8 @@ pkgbase = st-solarized-dark
 	makedepends = ncurses
 	depends = libxext
 	depends = libxft
+	provides = st
+	conflicts = st
 	source = http://dl.suckless.org/st/st-0.7.tar.gz
 	source = http://st.suckless.org/patches/solarized/st-no_bold_colors-0.7.diff
 	source = http://st.suckless.org/patches/solarized/st-solarized-dark-0.7.diff
diff --git a/PKGBUILD b/PKGBUILD
index 2f2c2eafd0e1..da4add0bd532 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,10 @@
 
 pkgname=st-solarized-dark
 appname='st'
+provides=('st')
+conflicts=('st')
 pkgver=0.7
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple virtual terminal emulator for X. Patched for solarized dark and Inconsolata font.'
 arch=('i686' 'x86_64')
 license=('MIT')
@@ -23,7 +25,7 @@ prepare() {
   patch -i "$srcdir/st-no_bold_colors-$pkgver.diff"
   patch -i "$srcdir/st-solarized-dark-$pkgver.diff"
   cp config.def.h config.h
-  sed -i 's/Liberation Mono:pixelsize=12:antialias=true:autohint=true/Inconsolata:pixelsize=16:antialias=true:autohint=true/' config.h 
+  sed -i 's/Liberation Mono:pixelsize=12:antialias=true:autohint=true/Inconsolata:pixelsize=20:antialias=true:autohint=true/' config.h 
 }
 
 build() {
@@ -33,10 +35,10 @@ build() {
 
 package() {
   cd "$srcdir/$appname-$pkgver"
-  make PREFIX=/usr DESTDIR="$pkgdir" TERMINFO="$pkgdir/usr/share/terminfo" install
   # Avoid conflict with ncurses package
-  rm "$pkgdir/usr/share/terminfo/s/st"
-  rm "$pkgdir/usr/share/terminfo/s/st-256color"
+  # rm "$pkgdir/usr/share/terminfo/s/st"
+  # rm "$pkgdir/usr/share/terminfo/s/st-256color"
+  make PREFIX=/usr DESTDIR="$pkgdir" TERMINFO="$pkgdir/usr/share/terminfo" install
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README"
 }