From 7743501ce5aae022da70e427d0145daee98605e2 Mon Sep 17 00:00:00 2001 From: haozi007 Date: Tue, 26 May 2020 14:40:22 +0800 Subject: [PATCH] adapt isula libutils merge into lcr Signed-off-by: haozi007 --- clibcni.spec | 6 +++--- cmake/checker.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clibcni.spec b/clibcni.spec index 5dcf488..04db20d 100644 --- a/clibcni.spec +++ b/clibcni.spec @@ -1,5 +1,5 @@ %global _version 2.0.1 -%global _release 20200523.160926.git34704f69 +%global _release 20200526.144122.git6b3b79b4 Name: clibcni Version: %{_version} Release: %{_release} @@ -12,9 +12,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version} BuildRequires: gcc BuildRequires: cmake -BuildRequires: iSula-libutils-devel yajl-devel +BuildRequires: lcr-devel yajl-devel -Requires: iSula-libutils +Requires: lcr %ifarch x86_64 aarch64 Provides: lib%{name}.so()(64bit) diff --git a/cmake/checker.cmake b/cmake/checker.cmake index de925e7..1d0edbe 100644 --- a/cmake/checker.cmake +++ b/cmake/checker.cmake @@ -12,7 +12,7 @@ endmacro() # check iSula libutils -pkg_check_modules(PC_ISULA_LIBUTILS REQUIRED "isula_libutils") +pkg_check_modules(PC_ISULA_LIBUTILS REQUIRED "lcr") 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") -- GitLab