diff --git a/.conmon.metadata b/.conmon.metadata
index 9925052..e39aada 100644
--- a/.conmon.metadata
+++ b/.conmon.metadata
@@ -1 +1 @@
-70fe00c8d5c114e0a81e1f4427ccc2077ff68744 SOURCES/v2.0.20.tar.gz
+fdede06f54899d2695c011ccc66fdeb6a12c49bd SOURCES/v2.0.22.tar.gz
diff --git a/.gitignore b/.gitignore
index 5d87dda..20621e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v2.0.20.tar.gz
+SOURCES/v2.0.22.tar.gz
diff --git a/SPECS/conmon.spec b/SPECS/conmon.spec
index 6e0f642..caadc51 100644
--- a/SPECS/conmon.spec
+++ b/SPECS/conmon.spec
@@ -1,33 +1,31 @@
-%global with_debug 0
%global with_check 0
-%if 0%{?with_debug}
%global _find_debuginfo_dwz_opts %{nil}
%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project containers
-%global repo conmon
+
# https://github.com/containers/conmon
-%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global import_path github.com/containers/%{name}
%global git0 https://%{import_path}
-Name: %{repo}
+Name: conmon
Epoch: 2
-Version: 2.0.20
-Release: 2%{?dist}
+Version: 2.0.22
+Release: 3%{?dist}
Summary: OCI container runtime monitor
License: ASL 2.0
URL: %{git0}
Source0: %{git0}/archive/v%{version}.tar.gz
+# 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:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1905383
+ExcludeArch: %{ix86}
BuildRequires: gcc
BuildRequires: git
BuildRequires: glib2-devel
BuildRequires: systemd-devel
+BuildRequires: golang >= 1.12.12-4
+BuildRequires: go-md2man
%description
%{summary}.
@@ -37,6 +35,7 @@ BuildRequires: systemd-devel
%build
export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
%{__make} all
%install
@@ -49,8 +48,35 @@ export CFLAGS="%{optflags} -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFF
%license LICENSE
%doc README.md
%{_bindir}/%{name}
+%{_mandir}/man8/*
%changelog
+* Mon Jan 04 2021 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-3
+- exclude i686 as golang is not suppoerted there
+- Related: #1888571
+
+* Sat Dec 26 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-2
+- add BR: golang, go-md2man
+- add man pages
+- Related: #1888571
+
+* Mon Dec 21 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.22-1
+- update to https://github.com/containers/conmon/releases/tag/v2.0.22
+- Related: #1888571
+
+* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.21-3
+- simplify spec
+- Related: #1888571
+
+* Mon Nov 09 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.21-2
+- be sure to harden the linked binary
+- compile with debuginfo enabled
+- Related: #1888571
+
+* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.21-1
+- synchronize with stream-container-tools-rhel8-rhel-8.4.0
+- Related: #1888571
+
* Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 2:2.0.20-2
- use proper CFLAGS
- Related: #1821193