summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD3
2 files changed, 5 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7a2a6c91d775..9e65d0fb6c16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sphinx
pkgdesc = Free open-source SQL full-text search engine.
pkgver = 2.2.11
- pkgrel = 3
+ pkgrel = 4
url = http://www.sphinxsearch.com/
install = sphinx.install
arch = i686
@@ -12,6 +12,8 @@ pkgbase = sphinx
depends = libmariadbclient
depends = postgresql-libs
optdepends = postgresql
+ conflicts = sphinx-beta
+ conflicts = sphinx-bin
backup = etc/conf.d/sphinx
source = https://sphinxsearch.com/files/sphinx-2.2.11-release.tar.gz
source = sphinx.conf.d
diff --git a/PKGBUILD b/PKGBUILD
index f5a482bff68b..4a822a612cf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
# Contributor: Florijan Hamzic <florijanh@gmail.com>
pkgname='sphinx'
pkgver=2.2.11
-pkgrel=3
+pkgrel=4
pkgdesc='Free open-source SQL full-text search engine.'
arch=('i686' 'x86_64')
url='http://www.sphinxsearch.com/'
@@ -17,6 +17,7 @@ license=('GPL')
depends=('unixodbc' 'expat' 'libmariadbclient' 'postgresql-libs')
optdepends=('postgresql')
backup=('etc/conf.d/sphinx')
+conflicts=("sphinx-beta" "sphinx-bin")
install='sphinx.install'
source=("https://sphinxsearch.com/files/${pkgname}-${pkgver}-release.tar.gz"
'sphinx.conf.d'