qupzilla{,1}: conflict with each other

This commit is contained in:
Jürgen Buchmüller 2016-04-03 18:24:42 +02:00
parent aa1e521b1e
commit b55b73aad4
2 changed files with 4 additions and 2 deletions

View File

@ -1,7 +1,7 @@
# Template file for 'qupzilla' # Template file for 'qupzilla'
pkgname=qupzilla pkgname=qupzilla
version=2.0.0 version=2.0.0
revision=1 revision=2
wrksrc=QupZilla-${version} wrksrc=QupZilla-${version}
build_style=qmake build_style=qmake
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
@ -15,6 +15,7 @@ license="GPL-3"
homepage="http://www.qupzilla.com/" homepage="http://www.qupzilla.com/"
distfiles="https://github.com/QupZilla/${pkgname}/releases/download/v${version}/QupZilla-${version}.tar.xz" distfiles="https://github.com/QupZilla/${pkgname}/releases/download/v${version}/QupZilla-${version}.tar.xz"
checksum=b357e2d3de91ec833a34f958c6eb649d86113235ee27a519722d8cae58bc8c78 checksum=b357e2d3de91ec833a34f958c6eb649d86113235ee27a519722d8cae58bc8c78
conflicts="qupzilla1>=0"
do_build() { do_build() {
# Avoid disable_parallel_build=yes by re-running make once # Avoid disable_parallel_build=yes by re-running make once

View File

@ -1,7 +1,7 @@
# Template file for 'qupzilla1' # Template file for 'qupzilla1'
pkgname=qupzilla1 pkgname=qupzilla1
version=1.8.9 version=1.8.9
revision=1 revision=2
wrksrc=QupZilla-${version} wrksrc=QupZilla-${version}
build_style=qmake build_style=qmake
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
@ -14,6 +14,7 @@ license="GPL-3"
homepage="http://www.qupzilla.com/" homepage="http://www.qupzilla.com/"
distfiles="https://github.com/QupZilla/qupzilla/releases/download/v${version}/QupZilla-${version}.tar.xz" distfiles="https://github.com/QupZilla/qupzilla/releases/download/v${version}/QupZilla-${version}.tar.xz"
checksum=620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac checksum=620ffb10a3f6b3f596c2c38a84d9c320cb66dd2d5e6701e8e31945e26308fcac
conflicts="qupzilla>=0"
do_build() { do_build() {
# Avoid disable_parallel_build=yes by re-running make once # Avoid disable_parallel_build=yes by re-running make once