Update to 2.2.0 upstream release

Upstream tag: v2.2.0 Upstream commit: ff908cce Commit authored by Packit automation (https://packit.dev/)
2026-05-05 07:52:23 +00:00 · 2026-01-12 11:58:07 +00:00
4 changed files with 107 additions and 25 deletions
@@ -0,0 +1,89 @@
+---
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+downstream_package_name: conmon
+upstream_tag_template: v{version}
+
+packages:
+  conmon-fedora:
+    pkg_tool: fedpkg
+    specfile_path: rpm/conmon.spec
+  conmon-centos:
+    pkg_tool: centpkg
+    specfile_path: rpm/conmon.spec
+  conmon-rhel:
+    specfile_path: rpm/conmon.spec
+
+jobs:
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-fedora]
+    notifications: &copr_build_failure_notification
+      failure_comment:
+        message: "Ephemeral COPR build failed. @containers/packit-build please check."
+    enable_net: true
+    targets:
+      - fedora-all-aarch64
+      - fedora-all-x86_64
+      - fedora-eln-aarch64
+      - fedora-eln-x86_64
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-centos]
+    notifications: *copr_build_failure_notification
+    enable_net: true
+    targets:
+      - centos-stream-10-aarch64
+      - centos-stream-10-x86_64
+      - centos-stream-9-aarch64
+      - centos-stream-9-x86_64
+
+  - job: copr_build
+    trigger: pull_request
+    packages: [conmon-rhel]
+    notifications: *copr_build_failure_notification
+    enable_net: true
+    targets:
+      - epel-9-aarch64
+      - epel-9-x86_64
+
+  # Run on commit to main branch
+  - job: copr_build
+    trigger: commit
+    notifications:
+      failure_comment:
+        message: "podman-next COPR build failed. @containers/packit-build please check."
+    branch: main
+    owner: rhcontainerbot
+    project: podman-next
+    enable_net: true
+
+  # Downstream sync for Fedora
+  - job: propose_downstream
+    trigger: release
+    packages: [conmon-fedora]
+    update_release: false
+    dist_git_branches:
+      - fedora-all
+
+  # Downstream sync for CentOS Stream
+  - job: propose_downstream
+    trigger: release
+    packages: [conmon-centos]
+    update_release: false
+    dist_git_branches:
+      - c10s
+
+  - job: koji_build
+    trigger: commit
+    packages: [conmon-fedora]
+    dist_git_branches:
+      - fedora-all
+
+  - job: bodhi_update
+    trigger: commit
+    packages: [conmon-fedora]
+    dist_git_branches:
+      - fedora-branched # rawhide updates are created automatically
@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 1.13.0.post1.dev2+g84134016c.
@@ -19,9 +19,9 @@ Epoch: 3
 %else
 Epoch: 2
 %endif
-Version: 2.2.1
+Version: 2.2.0
 License: Apache-2.0
-Release: 3%{?dist}
+Release: 1%{?dist}
 Summary: OCI container runtime monitor
 URL: https://github.com/containers/%{name}
 # Tarball fetched from upstream
@@ -31,10 +31,12 @@ BuildRequires: go-md2man
 %endif
 BuildRequires: gcc
 BuildRequires: git-core
+BuildRequires: glib2-devel
+BuildRequires: libseccomp-devel
+BuildRequires: pkgconfig
+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
@@ -47,10 +49,10 @@ Requires: libseccomp
 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 +62,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,23 +75,8 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
 %endif

 %changelog
-* 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
+* Mon Jan 12 2026 Packit <hello@packit.dev> - 2:2.2.0-1
+- Update to version 2.2.0

 * 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
@@ -1 +1 @@
-SHA512 (v2.2.1.tar.gz) = 52513fc25b0db0b7c9c99aa63f6be4c495add350b9269fad67136f728d3399dbb54c5fa526d52c158c67956ded8980f1cc3624fc531a152b16c09caa3399be3b
+SHA512 (v2.1.13.tar.gz) = cb98b26b3c5f5e5f0b09f5373bd58dc958b66ac4edcac2aa509f48be8b7e9a33001428016290944c4002ddbf63e11fb4657aaad879c89c5776f8c8031f4d1d08