From 43618197a96bd54aa967d49b9a4d9916a5fc71e9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 2 Sep 2024 18:34:48 +0530 Subject: [PATCH 1/2] RPM: do not create cri-o dirs cri-o dirs will be owned by the cri-o package Fixes: #517 Signed-off-by: Lokesh Mandvekar --- rpm/conmon.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rpm/conmon.spec b/rpm/conmon.spec index d2175809..82cbcc17 100644 --- a/rpm/conmon.spec +++ b/rpm/conmon.spec @@ -57,7 +57,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 @@ -70,8 +70,6 @@ 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 From 8abac789d85dd2b04f649ef9d49f9cd7eb34b32f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 2 Sep 2024 18:36:18 +0530 Subject: [PATCH 2/2] RPM: cleanup changelog conditionals All of our official downstream envs that build from this spec file support autochangelog so we don't need these conditionals. CentOS Stream 9 builds with this spec file are only on the podman-next COPR, so removing these conditionals is no big deal. Signed-off-by: Lokesh Mandvekar --- rpm/conmon.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rpm/conmon.spec b/rpm/conmon.spec index 82cbcc17..a2421317 100644 --- a/rpm/conmon.spec +++ b/rpm/conmon.spec @@ -76,9 +76,4 @@ sed -i 's/install.crio: bin\/conmon/install.crio:/' Makefile %endif %changelog -%if %{defined autochangelog} %autochangelog -%else -* Fri Jan 26 2024 RH Container Bot -- Placeholder changelog for envs that are not autochangelog-ready -%endif