2 Commits

Author SHA1 Message Date
Manabu Ori 47c442724a Merge branch 'c10s' into 'c10s'
Don't install CRI-O related files

See merge request redhat/centos-stream/rpms/conmon!47
2025-01-15 07:14:04 +00:00
Manabu Ori 1fb95889b2 Don't install CRI-O related files 2025-01-15 15:25:53 +09:00
2 changed files with 8 additions and 26 deletions
+7 -25
View File
@@ -7,33 +7,29 @@
%global debug_package %{nil} %global debug_package %{nil}
%endif %endif
%if %{defined rhel} %if 0%{?rhel}
%bcond_with docs %bcond_with docs
%else %else
%bcond_without docs %bcond_without docs
%endif %endif
Name: conmon Name: conmon
%if %{defined rhel}
Epoch: 3
%else
Epoch: 2 Epoch: 2
%endif Version: 2.1.12
Version: 2.2.1
License: Apache-2.0 License: Apache-2.0
Release: 1%{?dist} Release: %autorelease
Summary: OCI container runtime monitor Summary: OCI container runtime monitor
URL: https://github.com/containers/%{name} URL: https://github.com/containers/%{name}
# Tarball fetched from upstream # Tarball fetched from upstream
Source0: %{url}/archive/v%{version}.tar.gz Source0: %{url}/archive/v%{version}.tar.gz
%if %{with docs} %if %{with docs}
ExclusiveArch: %{golang_arches_future}
BuildRequires: go-md2man BuildRequires: go-md2man
%endif %endif
BuildRequires: gcc BuildRequires: gcc
BuildRequires: git-core BuildRequires: git-core
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: libseccomp-devel BuildRequires: libseccomp-devel
BuildRequires: pkgconfig
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: systemd-libs BuildRequires: systemd-libs
BuildRequires: make BuildRequires: make
@@ -45,11 +41,11 @@ Requires: libseccomp
%{summary}. %{summary}.
%prep %prep
%autosetup -Sgit %{name}-%{version} %autosetup -Sgit %{name}-%{built_tag_strip}
sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
%build %build
%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon %{__make} DEBUGFLAG="-g" bin/conmon
%if %{with docs} %if %{with docs}
%{__make} GOMD2MAN=go-md2man -C docs %{__make} GOMD2MAN=go-md2man -C docs
@@ -75,18 +71,4 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
%endif %endif
%changelog %changelog
* Thu Feb 12 2026 Jindrich Novy <jnovy@redhat.com> - 2:2.2.1-1 %autochangelog
- update to https://github.com/containers/conmon/releases/tag/v2.2.1
- 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
+1 -1
View File
@@ -1 +1 @@
SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b SHA512 (v2.1.12.tar.gz) = 06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20