Removed users.ini from package, as it causes conflicts

2 files changed, 7 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 293a2997e03b..41aae38d417e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Sep 27 16:28:03 UTC 2016
+# Wed Sep 28 14:36:45 UTC 2016
 pkgbase = splunk
 	pkgdesc = Statistical analysis and search tool for logs and machine data
 	pkgver = 6.5.0_59c8927def0f
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.splunk.com/
 	install = splunk.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 69313be89a2a..f7876b9dda42 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=splunk
 basever=6.5.0
 pkgver=${basever}_59c8927def0f
-pkgrel=1
+pkgrel=2
 pkgdesc="Statistical analysis and search tool for logs and machine data"
 url="http://www.splunk.com/"
 arch=('x86_64' 'i686')
@@ -21,4 +21,8 @@ package() {
 	install -Dm644 "$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
 	mkdir "$pkgdir/opt"
 	cp -r "$pkgname" "$pkgdir/opt/"
+
+	# This file causes conflicts with existing installs
+	# and ships empty anyway, so just remove it
+	rm "$pkgdir/opt/$pkgname/etc/users/users.ini"
 }