public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Bradley G Smith <bradley.g.smith@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/conmon] rawhide: Resolve i686 builds
Date: Thu, 30 Jul 2026 13:16:01 GMT [thread overview]
Message-ID: <178541736164.1.2536496763702564249.rpms-conmon-2af4800cbc0e@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/conmon
Branch : rawhide
Commit : 2af4800cbc0e590ebefc534dc7c0dc4b2755aedb
Author : Bradley G Smith <bradley.g.smith@gmail.com>
Date : 2026-07-23T09:44:53-07:00
Stats : +9/-13 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/conmon/c/2af4800cbc0e590ebefc534dc7c0dc4b2755aedb?branch=rawhide
Log:
Resolve i686 builds
- Resolves: rhbz#2503825
- Target only golang supported architectures
- go-md2man is no longer available on i686 in Fedora starting with
f45
- Incorporates modernized spec posted upstream by Jindrich Novy
Signed-off-by: Bradley G Smith <bradley.g.smith@gmail.com>
---
diff --git a/conmon.spec b/conmon.spec
index 969af02..bb1ca37 100644
--- a/conmon.spec
+++ b/conmon.spec
@@ -26,20 +26,19 @@ Summary: OCI container runtime monitor
URL: https://github.com/containers/%{name}
# Tarball fetched from upstream
Source0: %{url}/archive/v%{version}.tar.gz
+
+# available only on golang supported arches
+ExclusiveArch: %{golang_arches_future}
+
%if %{with docs}
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
-Requires: glib2
-Requires: systemd-libs
-Requires: libseccomp
+BuildRequires: pkgconfig(libsystemd)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(libseccomp)
%description
%{summary}.
@@ -49,10 +48,10 @@ Requires: libseccomp
sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
%build
-%{__make} DEBUGFLAG="-g" bin/conmon
+%make_build bin/conmon CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
%if %{with docs}
-%{__make} GOMD2MAN=go-md2man -C docs
+%make_build GOMD2MAN=go-md2man -C docs
%endif
%install
@@ -62,9 +61,6 @@ 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
reply other threads:[~2026-07-30 13:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178541736164.1.2536496763702564249.rpms-conmon-2af4800cbc0e@fedoraproject.org \
--to=bradley.g.smith@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox