2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 709070c85b5a..fb3ba1e7a4f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,12 +6,13 @@ pkgbase = libkexiv2-frameworks-git
 	arch = i686
 	arch = x86_64
 	license = LGPL
-	makedepends = git
 	makedepends = extra-cmake-modules
 	makedepends = kdoctools
+	makedepends = git
 	makedepends = python
 	depends = ktextwidgets
 	depends = exiv2
+	conflicts = libkexiv2
 	source = git://anongit.kde.org/libkexiv2#branch=frameworks
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 145a8aed4fce..16e970c82ea3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,14 +8,15 @@ arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2'
 license=('LGPL')
 depends=('ktextwidgets' 'exiv2')
-makedepends=('git' 'extra-cmake-modules' 'kdoctools' 'python')
+makedepends=('extra-cmake-modules' 'kdoctools' 'git' 'python')
+conflicts=('libkexiv2')
 source=('git://anongit.kde.org/libkexiv2#branch=frameworks')
 sha1sums=('SKIP')
 
 pkgver() {
   cd libkexiv2
-  _ver="$(cat CMakeLists.txt | grep -e KEXIV2_LIB_MAJOR_VERSION -e KEXIV2_LIB_MINOR_VERSION -e KEXIV2_LIB_PATCH_VERSION | head -n3 | cut -d '"' -f2)"
-  echo "$(echo ${_ver} | tr ' ' .).r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
+  _ver="$(cat CMakeLists.txt | grep -m3 -e KEXIV2_LIB_MAJOR_VERSION -e KEXIV2_LIB_MINOR_VERSION -e KEXIV2_LIB_PATCH_VERSION | cut -d '"' -f2 | paste -sd'.')"
+  echo "${_ver}.r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 prepare() {