summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames An2015-12-08 05:08:00 -0500
committerJames An2015-12-08 05:08:49 -0500
commit731eb4f44b827fe041a94644578004da28231fbd (patch)
tree405862676c3c3b96b20270eb5c737498acb41629
parent2c400ee4dfacbb56925fa07b5ff5a8bfdbd06867 (diff)
downloadaur-731eb4f44b827fe041a94644578004da28231fbd.tar.gz
Removed conflicts variable to allow it to co-exist with other solr packages.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
2 files changed, 1 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eea75dfd531a..ec8de4bd65af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Tue Dec 8 04:27:58 UTC 2015
+# Tue Dec 8 10:05:51 UTC 2015
pkgbase = solr5-zip
pkgdesc = Popular, blazing fast open source enterprise search platform from the Apache Lucene project
pkgver = 5.3.1
@@ -11,7 +11,6 @@ pkgbase = solr5-zip
depends = java-environment>=7
provides = solr=5
provides = solr5=5
- conflicts = solr
noextract = http://www.apache.org/dist/lucene/solr/5.3.1/solr-5.3.1.zip
source = http://www.apache.org/dist/lucene/solr/5.3.1/solr-5.3.1.zip
md5sums = c69eb24acb3821408eacf00651cc7022
diff --git a/PKGBUILD b/PKGBUILD
index 24c921fc46ad..344c14f82114 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,6 @@ url="http://lucene.apache.org/$_pkgname"
license=('Apache')
depends=('java-environment>=7')
provides=("$_pkgname=5" "${_pkgname}5=5")
-conflicts=("$_pkgname")
install="$pkgname.install"
source=("http://www.apache.org/dist/lucene/$_pkgname/$pkgver/$_pkgname-$pkgver.zip")
md5sums=('c69eb24acb3821408eacf00651cc7022')