diff --git a/.conmon.metadata b/.conmon.metadata index 2308c4c..29f3cb8 100644 --- a/.conmon.metadata +++ b/.conmon.metadata @@ -1 +1 @@ -108860ca85591f3ae2bc5e587cc83bc0839423ac SOURCES/v2.0.27.tar.gz +521832d18c9d5ed155a6be3d5a25e3072cdc73a3 SOURCES/conmon-2.0.29-7e6de66.tar.gz diff --git a/.gitignore b/.gitignore index 132a266..7dc16fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v2.0.27.tar.gz +SOURCES/conmon-2.0.29-7e6de66.tar.gz diff --git a/SPECS/conmon.spec b/SPECS/conmon.spec index 3856526..4800fb6 100644 --- a/SPECS/conmon.spec +++ b/SPECS/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: 1%{?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,34 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" %{_mandir}/man8/* %changelog +* Thu Jun 03 2021 Jindrich Novy - 2:2.0.29-1 +- update to https://github.com/containers/conmon/releases/tag/v2.0.29 +- Related: #1934415 + +* Thu Jun 03 2021 Jindrich Novy - 2:2.0.27-6 +- update to the latest content of https://github.com/containers/conmon/tree/master + (https://github.com/containers/conmon/commit/75e067e) +- Related: #1934415 + +* Wed Jun 02 2021 Jindrich Novy - 2:2.0.27-5 +- update to the latest content of https://github.com/containers/conmon/tree/master + (https://github.com/containers/conmon/commit/b033cb5) +- Related: #1934415 + +* Mon May 17 2021 Jindrich Novy - 2:2.0.27-4 +- update to the latest content of https://github.com/containers/conmon/tree/master + (https://github.com/containers/conmon/commit/3161452) +- Related: #1934415 + +* Mon May 10 2021 Jindrich Novy - 2:2.0.27-3 +- upload new source tarball +- Related: #1934415 + +* Mon May 10 2021 Jindrich Novy - 2:2.0.27-2 +- switch to master branch to fix /dev/null ownership issues + (https://github.com/containers/conmon/commit/372fa19211cfeabdb2bad52a4ab8a4d1b0b0063c) +- Related: #1934415 + * Tue Mar 09 2021 Jindrich Novy - 2:2.0.27-1 - update to https://github.com/containers/conmon/releases/tag/v2.0.27 - Related: #1934415