diff --git a/SPECS/containerd.spec b/SPECS/containerd.spec index 082b2d8..0e986ba 100644 --- a/SPECS/containerd.spec +++ b/SPECS/containerd.spec @@ -8,6 +8,8 @@ }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec +%global debug_package %{nil} + # Generated by go2rpm 1.11.0 %bcond_without check @@ -15,7 +17,7 @@ %global goipath github.com/containerd/containerd Version: 1.7.19 -%gometa -L -f +%gometa -f %global common_description %{expand: Containerd is an industry-standard container runtime with an emphasis on @@ -25,7 +27,7 @@ system: image transfer and storage, container execution and supervision, low-level storage and network attachments, etc.} Name: containerd -Release: %autorelease +Release: %autorelease.inferit Summary: An open and reliable container runtime # Generated by go-vendor-tools @@ -48,10 +50,13 @@ BuildRequires: systemd-rpm-macros Requires: runc +Provides: containerd.io = %{version}-%{release} +Provides: containerd.io(x86-64) = %{version}-%{release} + %description %{common_description} %prep -%goprep -A +%goprep %setup -q -T -D -a1 %{forgesetupargs} %autopatch -p1 # Replace default bin directory @@ -63,31 +68,15 @@ cp -p %{S:3} . %build GO_LDFLAGS="" GO_BUILDFLAGS="" -%global makeflags %{expand:\\ - DATADIR=%{_datadir} \\ - DESTDIR=%{buildroot} \\ - EXTRA_LDFLAGS=%{gobuild_ldflags_shescaped} \\ - GO_BUILD_FLAGS=%{gobuild_baseflags_shescaped} \\ - MANDIR=%{_mandir} \\ - PREFIX=%{_prefix} \\ - REVISION=%{release} \\ - SHIM_CGO_ENABLED=1 \\ - VERSION=%{version} \\ -} +%global makeflags DATADIR=%{_datadir} DESTDIR=%{buildroot} MANDIR=%{_mandir} PREFIX=%{_prefix} REVISION=%{release} SHIM_CGO_ENABLED=1 VERSION=%{version} %make_build %{makeflags} binaries man %install %go_vendor_license_install -c %{S:2} -%make_build %{makeflags} install install-man +%make_build %{makeflags} DESTDIR=%{buildroot} install install-man install -Dpm 0644 containerd.service -t %{buildroot}%{_unitdir} install -Dpm 0644 containerd.toml %{buildroot}%{_sysconfdir}/containerd/config.toml -%check -%go_vendor_license_check -c %{S:2} -%if %{with check} -%make_build %{makeflags} test -%endif - %files -f %{go_vendor_license_filelist} %license vendor/modules.txt %doc ROADMAP.md ADOPTERS.md BUILDING.md README.md RELEASES.md SCOPE.md @@ -105,7 +94,8 @@ install -Dpm 0644 containerd.toml %{buildroot}%{_sysconfdir}/containerd/config.t %changelog -* Mon Jul 22 2024 Sergey Cherevko - 1.7.19-2 +* Fri Jul 25 2024 Sergey Cherevko - 1.7.19-2.inferit +- Adapted for MSVSphere 9 build - Rebuilt for MSVSphere 9.4 ## START: Generated by rpmautospec