SPECS/containerd.spec

@@ -8,8 +8,6 @@
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
 ## END: Set by rpmautospec
 
-%global debug_package %{nil}
-
 # Generated by go2rpm 1.11.0
 %bcond_without check
 
@@ -17,7 +15,7 @@
 %global goipath         github.com/containerd/containerd
 Version:                1.7.19
 
-%gometa -f
+%gometa -L -f
 
 %global common_description %{expand:
 Containerd is an industry-standard container runtime with an emphasis on
@@ -27,7 +25,7 @@ system: image transfer and storage, container execution and supervision,
 low-level storage and network attachments, etc.}
 
 Name:           containerd
-Release:        %autorelease.inferit
+Release:        %autorelease
 Summary:        An open and reliable container runtime
 
 # Generated by go-vendor-tools
@@ -50,13 +48,10 @@ BuildRequires:  systemd-rpm-macros
 
 Requires:       runc
 
-Provides:       containerd.io = %{version}-%{release}
-Provides:       containerd.io(x86-64) = %{version}-%{release}
-
 %description %{common_description}
 
 %prep
-%goprep
+%goprep -A
 %setup -q -T -D -a1 %{forgesetupargs}
 %autopatch -p1
 # Replace default bin directory
@@ -68,15 +63,31 @@ cp -p %{S:3} .
 
 %build
 GO_LDFLAGS="" GO_BUILDFLAGS=""
-%global makeflags DATADIR=%{_datadir} DESTDIR=%{buildroot} MANDIR=%{_mandir} PREFIX=%{_prefix} REVISION=%{release} SHIM_CGO_ENABLED=1 VERSION=%{version}
+%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} \\
+}
 %make_build %{makeflags} binaries man
 
 %install
 %go_vendor_license_install -c %{S:2}
-%make_build %{makeflags} DESTDIR=%{buildroot} install install-man
+%make_build %{makeflags} 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
@@ -94,8 +105,7 @@ install -Dpm 0644 containerd.toml %{buildroot}%{_sysconfdir}/containerd/config.t
 
 
 %changelog
-* Fri Jul 25 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.7.19-2.inferit
+* Mon Jul 22 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.7.19-2
-- Adapted for MSVSphere 9 build
 - Rebuilt for MSVSphere 9.4
 
 ## START: Generated by rpmautospec