summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph R. Quinn2019-10-28 15:30:22 -0400
committerJoseph R. Quinn2019-10-28 15:30:22 -0400
commitb484252266b20140f526c0294da5c74f22fe8dfd (patch)
tree8b2900f3e48f31875a29637d3ccc8e1fb5e21d27
parent8d6c576dffe4c499cccf4083ed66e0b8bfe6096c (diff)
downloadaur-b484252266b20140f526c0294da5c74f22fe8dfd.tar.gz
Adding `php-phalcon-git` to conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f906c6495f1..568b40b2ba6f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,6 +13,7 @@ pkgbase = php-phalcon3
provides = php-phalcon
conflicts = php-phalcon
conflicts = php70-phalcon
+ conflicts = php-phalcon-git
backup = etc/php/conf.d/phalcon.ini
source = https://github.com/phalcon/cphalcon/archive/v3.4.4.zip
source = phalcon.ini
diff --git a/PKGBUILD b/PKGBUILD
index a17bc43639f2..4ce90bc34ae1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ depends=('php>=5.5')
makedepends=('gcc')
optdepends=('composer' 'php-fpm')
provides=('php-phalcon')
-conflicts=('php-phalcon' 'php70-phalcon')
+conflicts=('php-phalcon' 'php70-phalcon' 'php-phalcon-git')
backup=('etc/php/conf.d/phalcon.ini')
source=(
"https://github.com/phalcon/cphalcon/archive/v$pkgver.zip"