diff --git a/srcpkgs/protobuf24/template b/srcpkgs/protobuf24/template index db77f230c08..872c4cfa97f 100644 --- a/srcpkgs/protobuf24/template +++ b/srcpkgs/protobuf24/template @@ -1,7 +1,7 @@ # Template file for 'protobuf24' pkgname=protobuf24 version=3.13.0 -revision=1 +revision=2 wrksrc="protobuf-${version}" build_style=gnu-configure hostmakedepends="pkg-config automake libtool" @@ -15,8 +15,8 @@ distfiles="https://github.com/protocolbuffers/protobuf/archive/v${version}.tar.g checksum=9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a # Switch to versioned package -replaces="protobuf<=3.11.4_1" -conflicts="protobuf18>=0" +conflicts="protobuf18>=0 protobuf23>=0" +replaces="protobuf<=3.11.4_1 ${conflicts}" if [ "$CROSS_BUILD" ]; then # needs host protoc @@ -70,8 +70,8 @@ libprotoc24-devel_package() { depends="libprotoc24-${version}_${revision}" short_desc="Protocol buffers compiler library - development files" # Switch to versioned package - replaces="libprotoc-devel<=3.11.4_1" - conflicts="libprotoc18-devel>=0" + conflicts="libprotoc18-devel>=0 libprotoc23-devel>=0" + replaces="libprotoc-devel<=3.11.4_1 ${conflicts}" pkg_install() { vmove usr/lib/libprotoc.a vmove usr/lib/libprotoc.so @@ -85,8 +85,8 @@ protobuf24-devel_package() { libprotobuf24-lite-${version}_${revision}" short_desc="Protocol buffers C++ library - development files" # Switch to versioned package - replaces="protobuf-devel<=3.11.4_1" - conflicts="protobuf18-devel>=0" + conflicts="protobuf18-devel>=0 protobuf23-devel>=0" + replaces="protobuf-devel<=3.11.4_1 ${conflicts}" pkg_install() { vmove usr/include vmove usr/lib/libprotobuf.a