Added conflict with frr less than 9.1 (unreleased yet)

2 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0acb38c354af..06837af5aacf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libyang
 	pkgdesc = A YANG data modelling language parser and toolkit written (and providing API) in C
 	pkgver = 2.1.111
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/CESNET/libyang
 	arch = x86_64
 	arch = aarch64
@@ -17,6 +17,7 @@ pkgbase = libyang
 	depends = pcre2
 	conflicts = libyang-git
 	conflicts = libyang-devel-git
+	conflicts = frr<9.1
 	source = https://github.com/CESNET/libyang/archive/v2.1.111.tar.gz
 	sha256sums = 3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221
 
diff --git a/PKGBUILD b/PKGBUILD
index d9bb3d1fea9c..d5d519a3cb26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='libyang'
 pkgver='2.1.111'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='A YANG data modelling language parser and toolkit written (and providing API) in C'
 url="https://github.com/CESNET/${pkgname}"
 arch=('x86_64' 'aarch64' 'armv7h')
@@ -11,7 +11,7 @@ license=('BSD')
 depends=('pcre2')
 makedepends=('cmake' 'swig' 'doxygen' 'graphviz')
 checkdepends=('cmocka' 'shunit2' 'expect')
-conflicts=('libyang-git' 'libyang-devel-git')
+conflicts=('libyang-git' 'libyang-devel-git' 'frr<9.1')
 source=("${url}/archive/v${pkgver}.tar.gz")
 sha256sums=('3e52b922fcf371933ad7de1686ad83504e3358236e7817b5af795b0db52fa221')
 
@@ -23,10 +23,10 @@ prepare() {
 build() {
   cd "${pkgname}-${pkgver}/build"
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_TESTS=ON
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_INSTALL_LIBDIR="lib" \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DENABLE_TESTS="ON"
   make
 }