diff --git a/conmon.spec b/conmon.spec index ec84b1d..343417c 100644 --- a/conmon.spec +++ b/conmon.spec @@ -21,7 +21,7 @@ Epoch: 2 %endif Version: 2.2.1 License: Apache-2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OCI container runtime monitor URL: https://github.com/containers/%{name} # Tarball fetched from upstream @@ -31,12 +31,10 @@ 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 @@ -49,10 +47,10 @@ Requires: libseccomp sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile %build -%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon +%make_build bin/conmon %if %{with docs} -%{__make} GOMD2MAN=go-md2man -C docs +%make_build GOMD2MAN=go-md2man -C docs %endif %install @@ -62,9 +60,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 @@ -75,6 +70,10 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile %endif %changelog +* Mon Feb 16 2026 Jindrich Novy - 2:2.2.1-2 +- use proper macros in spec file and simplify +- Related: RHEL-111917 + * Thu Feb 12 2026 Jindrich Novy - 2:2.2.1-1 - update to https://github.com/containers/conmon/releases/tag/v2.2.1 - enable RELRO