From 7da5d7790bb321ea9296c75174adb6d83b857de5 Mon Sep 17 00:00:00 2001
From: zhongtao <zhongtao17@huawei.com>
Date: Thu, 16 Nov 2023 07:12:34 +0000
Subject: [PATCH] =?UTF-8?q?!635=20remove=20libisulad=5Fimg.so=20and=20imag?=
 =?UTF-8?q?e=5Fapi.h=20in=20*=20delete=20libisulad=5Fimg.so=20and=20compil?=
 =?UTF-8?q?ation=20dependency:=20lxc,=20and=20add=20runni=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 iSulad.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/iSulad.spec b/iSulad.spec
index c406fcc..a2540fc 100644
--- a/iSulad.spec
+++ b/iSulad.spec
@@ -1,5 +1,5 @@
 %global _version 2.1.4
-%global _release 1
+%global _release 2
 %global is_systemd 1
 %global enable_criv1 1
 %global enable_shimv2 1
@@ -37,7 +37,6 @@ Patch6001:	6001-modify-daemon-json-default-runtime-to-runc.patch
 %ifarch x86_64 aarch64
 Provides:       libhttpclient.so()(64bit)
 Provides:       libisula_client.so()(64bit)
-Provides:       libisulad_img.so()(64bit)
 Provides:       libisulad_tools.so()(64bit)
 %endif
 
@@ -65,7 +64,7 @@ BuildRequires: gtest-devel gmock-devel
 %define lcrver_upper 2.1.4-0
 
 BuildRequires: libisula-devel > %{lcrver_lower} libisula-devel < %{lcrver_upper}
-BuildRequires: cmake gcc-c++ yajl-devel lxc lxc-devel
+BuildRequires: cmake gcc-c++ yajl-devel
 BuildRequires: grpc grpc-plugins grpc-devel protobuf-devel
 BuildRequires: libcurl libcurl-devel libarchive-devel device-mapper-devel
 BuildRequires: http-parser-devel
@@ -78,11 +77,12 @@ BuildRequires: lib-shim-v2 lib-shim-v2-devel
 
 
 Requires:      libisula > %{lcrver_lower} libisula < %{lcrver_upper}
-Requires:      grpc protobuf docker-runc
+Requires:      grpc protobuf
 Requires:      libcurl
 Requires:      http-parser libseccomp
 Requires:      libcap libselinux libwebsockets libarchive device-mapper
 Requires:      systemd
+Requires:      (docker-runc or runc)
 BuildRequires: libevhtp libevent
 %if 0%{?enable_shimv2}
 Requires:      lib-shim-v2
@@ -139,7 +139,6 @@ install -d $RPM_BUILD_ROOT/%{_libdir}
 install -m 0755 ./src/libisula_client.so             %{buildroot}/%{_libdir}/libisula_client.so
 install -m 0755 ./src/utils/http/libhttpclient.so  %{buildroot}/%{_libdir}/libhttpclient.so
 install -m 0755 ./src/libisulad_tools.so  %{buildroot}/%{_libdir}/libisulad_tools.so
-install -m 0755 ./src/daemon/modules/image/libisulad_img.so   %{buildroot}/%{_libdir}/libisulad_img.so
 
 install -d $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 install -m 0640 ./conf/isulad.pc              %{buildroot}/%{_libdir}/pkgconfig/isulad.pc
@@ -152,7 +151,6 @@ install -m 0755 ./src/isulad-shim            %{buildroot}/%{_bindir}/isulad-shim
 install -m 0755 ./src/isulad                 %{buildroot}/%{_bindir}/isulad
 
 install -d $RPM_BUILD_ROOT/%{_includedir}/isulad
-install -m 0644 ../src/daemon/modules/api/image_api.h         %{buildroot}/%{_includedir}/isulad/image_api.h
 
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/isulad
 install -m 0640 ../src/contrib/config/daemon.json           %{buildroot}/%{_sysconfdir}/isulad/daemon.json
@@ -269,7 +267,6 @@ fi
 %{_initddir}/isulad.init
 %attr(0640,root,root) %{_initddir}/isulad.init
 %endif
-%{_includedir}/isulad/*
 %attr(0755,root,root) %{_libdir}/pkgconfig
 %attr(0640,root,root) %{_libdir}/pkgconfig/isulad.pc
 %defattr(0755,root,root,0755)
@@ -287,6 +284,12 @@ fi
 %endif
 
 %changelog
+* Wed Nov 15 2023 zhongtao <zhongtao17@huawei.com> - 2.1.4-2
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC: delete libisulad_img.so and compilation dependency: lxc, and add running dependency:runc
+
 * Tue Nov 14 2023 zhongtao <zhongtao17@huawei.com> - 2.1.4-1
 - Type: update
 - ID: NA