X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) by lists.alpinelinux.org (Postfix) with ESMTP id 58FB65C4609 for ; Thu, 30 Mar 2017 13:31:21 +0000 (GMT) Received: from ost.org.ua ([195.144.25.230] helo=alpine.ost.org.ua) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1ctaAb-0008Oa-1U for alpine-aports@lists.alpinelinux.org; Thu, 30 Mar 2017 16:31:21 +0300 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] community/php7: fix conflict with php5 Date: Thu, 30 Mar 2017 16:31:20 +0300 Message-Id: <20170330133120.15570-1-valery.kartel@gmail.com> X-Mailer: git-send-email 2.12.2 Sender: droid@infogroup.kiev.ua X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: fix conflict if both php5-dev, php7-dev would be installed fix php5-dev depends (add autoconf, pcre-dev) --- community/php7/APKBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD index 416b69e853..49812d74d2 100644 --- a/community/php7/APKBUILD +++ b/community/php7/APKBUILD @@ -3,13 +3,16 @@ pkgname=php7 _pkgreal=php pkgver=7.0.17 -pkgrel=1 +pkgrel=2 pkgdesc="The PHP language runtime engine - 7th branch" url="http://www.php.net/" arch="all" +provides="php" +replaces="php5" license="PHP-3" options="" depends="$pkgname-common" +depends_dev="$pkgname autoconf pcre-dev" depends_dom="$pkgname-xml" depends_mysqlnd="$pkgname-mysqli" depends_phar="$pkgname" @@ -192,8 +195,7 @@ package() { dev() { default_dev - replaces="php-dev" - depends="$depends $pkgname $pkgname-pear" + replaces="$replaces-dev" mkdir -p "$subpkgdir"/usr/bin \ "$subpkgdir"/usr/lib/$pkgname || return 1 @@ -289,6 +291,7 @@ fpm() { pear() { pkgdesc="PHP Extension and Application Repository" depends="$pkgname $pkgname-xml" + replaces="$replaces-pear" mkdir -p "$subpkgdir"/usr/bin \ "$subpkgdir"/etc/$pkgname -- 2.12.2 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---