Merge branch 'c10s' into 'c10s'

Don't install CRI-O related files

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

.fmf/version

@@ -1 +0,0 @@
-1

conmon.spec

@@ -7,34 +7,32 @@
 %global debug_package %{nil}
 %endif
 
-%if %{defined rhel}
+%if 0%{?rhel}
 %bcond_with docs
 %else
 %bcond_without docs
 %endif
 
 Name: conmon
-%if %{defined rhel}
-Epoch: 3
-%else
 Epoch: 2
-%endif
+Version: 2.1.12
-Version: 2.2.1
 License: Apache-2.0
-Release: 4%{?dist}
+Release: %autorelease
 Summary: OCI container runtime monitor
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
 Source0: %{url}/archive/v%{version}.tar.gz
 %if %{with docs}
+ExclusiveArch: %{golang_arches_future}
 BuildRequires: go-md2man
 %endif
 BuildRequires: gcc
 BuildRequires: git-core
+BuildRequires: glib2-devel
+BuildRequires: libseccomp-devel
+BuildRequires: systemd-devel
+BuildRequires: systemd-libs
 BuildRequires: make
-BuildRequires: pkgconfig(libsystemd)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(libseccomp)
 Requires: glib2
 Requires: systemd-libs
 Requires: libseccomp
@@ -43,14 +41,14 @@ Requires: libseccomp
 %{summary}.
 
 %prep
-%autosetup -Sgit %{name}-%{version}
+%autosetup -Sgit %{name}-%{built_tag_strip}
 sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 
 %build
-%make_build bin/conmon CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
+%{__make} DEBUGFLAG="-g" bin/conmon
 
 %if %{with docs}
-%make_build GOMD2MAN=go-md2man -C docs
+%{__make} GOMD2MAN=go-md2man -C docs
 %endif
 
 %install
@@ -60,6 +58,9 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
 %endif
 
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
 %files
 %license LICENSE
 %doc README.md
@@ -70,32 +71,4 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %endif
 
 %changelog
-* Fri May 29 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-4
+%autochangelog
-- Add TMT test infrastructure for tier0 gating
-- Resolves: RHEL-180349
-
-* Fri Feb 27 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-3
-- pass %%{optflags} and %%{build_ldflags} to enable stack protector
-  and FORTIFY_SOURCE hardening flags
-- Resolves: RHEL-152224
-
-* Mon Feb 16 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-2
-- use proper macros in spec file and simplify
-- Related: RHEL-111917
-
-* Thu Feb 12 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-1
-- update to https://github.com/containers/conmon/releases/tag/v2.2.1
-- enable RELRO
-- Related: RHEL-122178
-
-* Tue Feb 03 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.0-1
-- update to https://github.com/containers/conmon/releases/tag/v2.2.0
-- Related: RHEL-122178
-
-* 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

gating.yaml

@@ -3,5 +3,4 @@
 product_versions:
   - rhel-10
 decision_context: osci_compose_gate
-rules:
+rules: []
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

plans/conmon.fmf

@@ -1,27 +0,0 @@
----
-summary: Run conmon tests
-description: Test plan for conmon
-contact: jnovy@redhat.com
-
-discover:
-    how: fmf
-
-provision:
-    how: artemis
-
-prepare:
-    - how: install
-      package:
-        - crun
-        - podman
-        - podman-tests
-        - git
-    - how: shell
-      script: |
-        BATS_VERSION=1.11.0
-        curl -L https://github.com/bats-core/bats-core/archive/refs/tags/v$BATS_VERSION.tar.gz | tar zx
-        cd bats-core-$BATS_VERSION
-        ./install.sh /usr
-
-execute:
-    how: tmt

sources

@@ -1 +1 @@
-SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
+SHA512 (v2.1.12.tar.gz) = 06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20

tests/main.fmf

@@ -1,8 +0,0 @@
-summary: Run basic podman tests to verify conmon
-test: cd /usr/share/podman/test/system && bats 030-run.bats 075-exec.bats
-require:
-    - podman
-    - conmon
-duration: 15m
-tag:
-    - gate