xorg-server1.16: conflicts with xorg-server, rather than replaces.

xbps-0.43.1 fails to detect the "replaces" properly when there's a
revdep that depends on another vpkg version.

For now just conflict with any xorg-server pkg.
This commit is contained in:
Juan RP 2015-02-12 16:35:43 +01:00
parent e1b4625218
commit c9e4c416ce

View file

@ -1,7 +1,7 @@
# Template build file for 'xorg-server1.16'. # Template build file for 'xorg-server1.16'.
pkgname=xorg-server1.16 pkgname=xorg-server1.16
version=1.16.4 version=1.16.4
revision=1 revision=2
wrksrc="xorg-server-${version}" wrksrc="xorg-server-${version}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-ipv6 --enable-xcsecurity --enable-record configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
@ -39,7 +39,7 @@ makedepends="
# See hw/xfree86/common/xf86Module.h. Only care for the major version. # See hw/xfree86/common/xf86Module.h. Only care for the major version.
depends="xkeyboard-config" depends="xkeyboard-config"
provides="xorg-server-${version}_${revision} xserver-abi-extension-8_1 xserver-abi-input-21_1 xserver-abi-video-18_1" provides="xorg-server-${version}_${revision} xserver-abi-extension-8_1 xserver-abi-input-21_1 xserver-abi-video-18_1"
replaces="xorg-server>=0" conflicts="xorg-server>=0"
# Package build options # Package build options
build_options="systemd" build_options="systemd"