From 6e8b2681571411035c322706eae38a4c42e72e90 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 17 Jan 2025 14:36:12 +0100 Subject: [PATCH] conmon-2.1.12-4.el10 - Fix spec file, remove crio - Related: RHEL-58990 Signed-off-by: Jindrich Novy --- conmon.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/conmon.spec b/conmon.spec index 6600e6d..b992b65 100644 --- a/conmon.spec +++ b/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 +%endif Version: 2.1.12 License: Apache-2.0 -Release: %autorelease +Release: 4%{?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,12 @@ 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 +* Fri Jan 17 2025 Jindrich Novy - 3:2.1.12-4 +- Fix spec file, remove crio +- Related: RHEL-58990