diff options
Diffstat (limited to 'iSulad.spec')
| -rw-r--r-- | iSulad.spec | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/iSulad.spec b/iSulad.spec index c3bdf56..09af459 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.1.5 -%global _release 21 +%global _release 22 %global is_systemd 1 %global enable_criv1 1 %global enable_cdi 1 @@ -221,6 +221,7 @@ Patch0197: 0197-coco-support-confidential-containers.patch Patch0198: 0198-isolate-isula-search-ut-in-registry_images_ut.patch Patch0199: 0199-move-sandbox-network_ready-from-metadata-to-state-fo.patch Patch0200: 0200-clean-sandbox-when-create-failed-to-be-consisent-wit.patch +Patch0201: 0201-Bump-cmake-version-required-for-cmake-4.patch %ifarch x86_64 aarch64 Provides: libhttpclient.so()(64bit) @@ -231,7 +232,7 @@ Provides: libisulad_tools.so()(64bit) %if 0%{?is_systemd} # Systemd 230 and up no longer have libsystemd-journal BuildRequires: pkgconfig(systemd) -Requires: systemd-units +%{?systemd_requires} %else Requires(post): chkconfig Requires(preun): chkconfig @@ -427,10 +428,6 @@ fi %endif fi -if ! getent group isula > /dev/null; then - groupadd --system isula -fi - %preun %if 0%{?is_systemd} %systemd_preun isulad @@ -451,37 +448,36 @@ fi %endif %files -%attr(0600,root,root) %{_sysconfdir}/sysmonitor/process/isulad-monit -%attr(0550,root,root) %{_sysconfdir}/default/isulad/isulad-check.sh %defattr(0640,root,root,0750) -%{_sysconfdir}/isulad -%{_sysconfdir}/isulad/* -%{_sysconfdir}/default/* -%defattr(-,root,root,-) +%dir %{_sysconfdir}/default/ +%dir %{_sysconfdir}/default/isulad +%attr(0550,root,root) %{_sysconfdir}/default/isulad/isulad-check.sh +%{_sysconfdir}/default/isulad/*.json +%dir %{_sysconfdir}/default/isulad/hooks +%{_sysconfdir}/default/isulad/hooks/* +%dir %{_sysconfdir}/isulad +%attr(0640,root,root) %config(noreplace,missingok) %{_sysconfdir}/isulad/*.json +%attr(0640,root,root) %config(noreplace,missingok) %{_sysconfdir}/sysconfig/iSulad +%attr(0600,root,root) %{_sysconfdir}/sysmonitor/process/isulad-monit %if 0%{?is_systemd} -%{_unitdir}/isulad.service -%attr(0640,root,root) %{_unitdir}/isulad.service +%attr(0640,root,root) %config(noreplace,missingok) %{_unitdir}/isulad.service %else -%{_initddir}/isulad.init -%attr(0640,root,root) %{_initddir}/isulad.init +%attr(0640,root,root) %config(noreplace,missingok) %{_initddir}/isulad.init %endif -%attr(0755,root,root) %{_libdir}/pkgconfig -%attr(0640,root,root) %{_libdir}/pkgconfig/isulad.pc %defattr(0755,root,root,0755) %{_bindir}/* -%{_libdir}/* -%attr(0640,root,root) %{_sysconfdir}/sysconfig/iSulad -%attr(0640,root,root) %{_sysconfdir}/isulad/daemon.json - -%config(noreplace,missingok) %{_sysconfdir}/sysconfig/iSulad -%config(noreplace,missingok) %{_sysconfdir}/isulad/daemon.json -%if 0%{?is_systemd} -%config(noreplace,missingok) %{_unitdir}/isulad.service -%else -%config(noreplace,missingok) %{_initddir}/isulad.init -%endif +%{_libdir}/*.so +%defattr(-,root,root,-) +%{_libdir}/pkgconfig/isulad.pc %changelog +* Sat Aug 23 2025 Funda Wang <fundawang@yeah.net> - 2.1.5-22 +- Type:enhancement +- CVE:NA +- SUG:NA +- DESC: fix build with cmake 4 +- DESC: cleanup file list + * Tue Mar 18 2025 dongyuzhen <dongyuzhen@h-partners.com> - 2.1.5-21 - Type:enhancement - CVE:NA |