!157 modify lcr dependence to libisula

Merge pull request !157 from zhangxiaoyu/openEuler-22.03-LTS-Next

0001-modify-liblcr-to-libisula.patch

@@ -0,0 +1,57 @@
+From 92ded2cf442878a3d387f6d3f79e74595c785790 Mon Sep 17 00:00:00 2001
+From: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+Date: Tue, 7 Feb 2023 14:57:40 +0800
+Subject: [PATCH] modify liblcr to libisula
+
+Signed-off-by: zhangxiaoyu <zhangxiaoyu58@huawei.com>
+---
+ CMakeLists.txt      | 2 +-
+ clibcni.spec        | 4 ++--
+ cmake/checker.cmake | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f87de1d..c2c5b13 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,7 +56,7 @@ else()
+   set(LIB_INSTALL_DIR_DEFAULT "lib")
+ endif()
+ 
+-# set liblcr compile flags
++# set libisula compile flags
+ if (CLIBCNI_GCOV)
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_OPTION} -fprofile-arcs -ftest-coverage -fkeep-static-functions -fkeep-inline-functions")
+     message("------compile with gcov-------------")
+diff --git a/clibcni.spec b/clibcni.spec
+index 7ec45d1..3e9de91 100644
+--- a/clibcni.spec
++++ b/clibcni.spec
+@@ -12,9 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}
+ 
+ BuildRequires: gcc
+ BuildRequires: cmake
+-BuildRequires: lcr-devel yajl-devel gtest-devel
++BuildRequires: libisula-devel yajl-devel gtest-devel
+ 
+-Requires:      lcr
++Requires:      libisula
+ 
+ %ifarch x86_64 aarch64
+ Provides:       lib%{name}.so()(64bit)
+diff --git a/cmake/checker.cmake b/cmake/checker.cmake
+index 4198c94..85d2b9a 100644
+--- a/cmake/checker.cmake
++++ b/cmake/checker.cmake
+@@ -12,7 +12,7 @@ endmacro()
+ 
+ 
+ # check iSula libutils
+-pkg_check_modules(PC_ISULA_LIBUTILS REQUIRED "lcr")
++pkg_check_modules(PC_ISULA_LIBUTILS REQUIRED "libisula")
+ find_path(ISULA_LIBUTILS_INCLUDE_DIR isula_libutils/log.h
+ 	HINTS ${PC_ISULA_LIBUTILS_INCLUDEDIR} ${PC_ISULA_LIBUTILS_INCLUDE_DIRS})
+ _CHECK(ISULA_LIBUTILS_INCLUDE_DIR "ISULA_LIBUTILS_INCLUDE_DIR-NOTFOUND" "isula_libutils/log.h")
+-- 
+2.25.1
+

clibcni.spec

@@ -1,5 +1,5 @@
 %global _version 2.0.7
-%global _release 6
+%global _release 8
 Name:      clibcni
 Version:   %{_version}
 Release:   %{_release}
@@ -10,16 +10,17 @@ URL:       https://gitee.com/openeuler/clibcni
 Source0:   https://gitee.com/openeuler/clibcni/repository/archive/v%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}
 
-%define lcrver_lower 2.0.9-0
-%define lcrver_upper 2.0.10-0
+Patch0001:	0001-modify-liblcr-to-libisula.patch
+
+%define libisulaver_lower 2.1.1-0
 
 BuildRequires: gcc git gcc-c++
 BuildRequires: cmake
-BuildRequires: lcr-devel > %{lcrver_lower} lcr-devel < %{lcrver_upper} yajl-devel gtest-devel gmock-devel
+BuildRequires: libisula-devel > %{libisulaver_lower} yajl-devel gtest-devel gmock-devel
 
-Requires:      lcr > %{lcrver_lower} lcr < %{lcrver_upper}
+Requires:      libisula > %{libisulaver_lower}
 
-%ifarch x86_64 aarch64 loongarch64
+%ifarch x86_64 aarch64 riscv64 loongarch64
 Provides:       lib%{name}.so()(64bit)
 %endif
 
@@ -34,7 +35,7 @@ focus, CNI has a wide range of support and the specification is simple to implem
 %package devel
 Summary: Huawei CNI C Library
 Group:   Libraries
-ExclusiveArch:  x86_64 aarch64 sw_64 loongarch64
+ExclusiveArch:  x86_64 aarch64 sw_64 riscv64 loongarch64
 Requires:       %{name} = %{version}-%{release}
 
 %description devel
@@ -88,6 +89,18 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri May 19 2023 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 2.0.7-8
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: modify lcr dependence to libisula
+
+* Mon Mar 27 2023 misaka00251 <liuxin@iscas.ac.cn> - 2.0.7-7
+- Type: feature
+- ID: NA
+- SUG: NA
+- DESC: Add riscv64 architecture
+
 * Fri May 12 2023 Wenlong Zhang <zhangwenlong@loongson.cn> - 2.0.7-6
 - Type: feature
 - ID: NA