add conflicts

2 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d18d8c0efc7e..28008022fc13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,6 +6,7 @@ pkgbase = 5up-bin
 	arch = x86_64
 	license = GPL
 	depends = qt4
+	conflicts = 5up
 	options = !strip
 	source = http://5cm.ru/5up/installers/deb64/5up_1.7.0_amd64.deb
 	md5sums = 61871c0cbd74176da47235dc0f732160
diff --git a/PKGBUILD b/PKGBUILD
index 40f1a55060e1..86e72cb484c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,6 +9,7 @@ arch=('x86_64')
 url='http://img.5cm.ru/'
 license=('GPL')
 depends=('qt4')
+conflicts=('5up')
 options=(!strip)
 
 source=("http://5cm.ru/5up/installers/deb64/5up_${pkgver}_amd64.deb")
@@ -23,8 +24,7 @@ prepare() {
 package() {
   install -dm 755 "$pkgdir/usr/share/licenses/$pkgname/"
   install -dm 755 "$pkgdir/usr/bin/"
-   
+
   install -Dm 755 "$srcdir"/usr/share/doc/5up/copyright "$pkgdir"/usr/share/licenses/$pkgname/
-  install -Dm 755 "$srcdir/usr/bin/5up" "$pkgdir"/usr/bin/  
+  install -Dm 755 "$srcdir/usr/bin/5up" "$pkgdir"/usr/bin/
 }
-