Merge branch 'c10s-tmt' into 'c10s'

Draft: [c10s] TMT: initial enablement

See merge request redhat/centos-stream/rpms/conmon!46

conmon.spec

@@ -7,17 +7,21 @@
 %global debug_package %{nil}
 %endif
 
-%if 0%{?rhel}
+%if %{defined rhel}
 %bcond_with docs
 %else
 %bcond_without docs
 %endif
 
 Name: conmon
+%if %{defined rhel}
+Epoch: 3
+%else
 Epoch: 2
-Version: 2.1.12
+%endif
+Version: 2.1.13
 License: Apache-2.0
-Release: %autorelease
+Release: 1%{?dist}
 Summary: OCI container runtime monitor
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
@@ -41,9 +45,8 @@ Requires: libseccomp
 %{summary}.
 
 %prep
-%autosetup -Sgit %{name}-%{built_tag_strip}
+%autosetup -Sgit %{name}-%{version}
 sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
-sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 
 %build
 %{__make} DEBUGFLAG="-g" bin/conmon
@@ -53,7 +56,7 @@ sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 %endif
 
 %install
-%{__make} PREFIX=%{buildroot}%{_prefix} install.bin install.crio
+%{__make} PREFIX=%{buildroot}%{_prefix} install.bin
 
 %if %{with docs}
 %{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
@@ -66,12 +69,16 @@ sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-%{_libexecdir}/crio/%{name}
-%dir %{_libexecdir}/crio
 
 %if %{with docs}
 %{_mandir}/man8/%{name}.8.gz
 %endif
 
 %changelog
-%autochangelog
+* Wed Feb 26 2025 Jindrich Novy <jnovy@redhat.com> - 2:2.1.13-1
+- update to https://github.com/containers/conmon/releases/tag/v2.1.13
+- Resolves: RHEL-80818
+
+* Fri Jan 17 2025 Jindrich Novy <jnovy@redhat.com> - 3:2.1.12-4
+- Fix spec file, remove crio
+- Related: RHEL-58990

sources

@@ -1 +1 @@
-SHA512 (v2.1.12.tar.gz) = 06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20
+SHA512 (v2.1.13.tar.gz) = cb98b26b3c5f5e5f0b09f5373bd58dc958b66ac4edcac2aa509f48be8b7e9a33001428016290944c4002ddbf63e11fb4657aaad879c89c5776f8c8031f4d1d08