From a9a288de2675317171ebba1694ca56d45bb2a23b Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 14 Jun 2021 09:37:10 +0200 Subject: [PATCH] conmon-2.0.29-2.el9 - update to https://github.com/containers/conmon/releases/tag/v2.0.29 - Related: #1970747 Signed-off-by: Jindrich Novy --- conmon.spec | 21 ++++++++++++++++++--- sources | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/conmon.spec b/conmon.spec index d26cb11..2b68dfb 100644 --- a/conmon.spec +++ b/conmon.spec @@ -6,15 +6,21 @@ # https://github.com/containers/conmon %global import_path github.com/containers/%{name} %global git0 https://%{import_path} +%global commit0 7e6de6678f6ed8a18661e1d5721b81ccee293b9b +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: conmon Epoch: 2 -Version: 2.0.27 +Version: 2.0.29 Release: 2%{?dist} Summary: OCI container runtime monitor License: ASL 2.0 URL: %{git0} -Source0: %{git0}/archive/v%{version}.tar.gz +%if 0%{?branch:1} +Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz +%else +Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz +%endif # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures #ExclusiveArch: %%{go_arches} # still use arch exclude as the macro above still refers %%{ix86} in RHEL8.4: @@ -26,12 +32,17 @@ BuildRequires: glib2-devel BuildRequires: systemd-devel BuildRequires: golang >= 1.12.12-4 BuildRequires: go-md2man +BuildRequires: libseccomp-devel %description %{summary}. %prep -%autosetup -Sgit +%if 0%{?branch:1} +%autosetup -Sgit -n containers-%{name}-%{shortcommit0} +%else +%autosetup -Sgit -n %{name}-%{commit0} +%endif %build export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" @@ -51,6 +62,10 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" %{_mandir}/man8/* %changelog +* Mon Jun 14 2021 Jindrich Novy - 2:2.0.29-2 +- update to https://github.com/containers/conmon/releases/tag/v2.0.29 +- Related: #1970747 + * Thu Apr 15 2021 Mohan Boddu - 2:2.0.27-2 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index 0d72af9..b607bfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v2.0.27.tar.gz) = 2bc389fa3963cbb612669ec1d288adc888d7ac1de2b9bf483f18e0f62220775327ebcb771bfa7236815ef7247adb8fc6b8ae38748f7a383ec9590e3ee5769b65 +SHA512 (conmon-2.0.29-7e6de66.tar.gz) = 4b6992130dc54bea1c63e69607e0361153c2783931bc74bab8f8df4113aa8f595ee65d241bb9e942a74b5550ba1c4ad1f08cc57d749345b6705b86ded3f304e7