remove conflict with mysql-jdbc

2 files changed, 4 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9be65f13bc16..67e1c40ecf00 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 # Generated by mksrcinfo v8
-# Thu Jan 14 09:15:52 UTC 2016
+# Fri Jan 15 05:43:54 UTC 2016
 pkgbase = mariadb-jdbc
 	pkgdesc = The official JDBC driver (Java library) for MariaDB
 	pkgver = 1.3.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://downloads.mariadb.org/client-java/
 	arch = any
 	license = LGPL2.1
 	depends = java-runtime
 	provides = mysql-jdbc
-	conflicts = mysql-jdbc
 	replaces = mysql-jdbc
 	source = https://code.mariadb.com/connectors/java/connector-java-1.3.4/mariadb-java-client-1.3.4.jar
 	md5sums = 0906859def52f31bcb046cde20cf15b3
diff --git a/PKGBUILD b/PKGBUILD
index 7328ee417284..6610f48a4ade 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=mariadb-jdbc
 pkgver=1.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="The official JDBC driver (Java library) for MariaDB"
 arch=('any')
 url="https://downloads.mariadb.org/client-java/"
 license=('LGPL2.1')
 depends=('java-runtime')
 provides=('mysql-jdbc')
-conflicts=('mysql-jdbc')
+#conflicts=('mysql-jdbc')
 replaces=('mysql-jdbc')
 source=("https://code.mariadb.com/connectors/java/connector-java-${pkgver}/mariadb-java-client-${pkgver}.jar")
 md5sums=("0906859def52f31bcb046cde20cf15b3")