mirror of
https://gitlab.com/redhat/centos-stream/rpms/conmon.git
synced 2026-05-04 23:42:20 +00:00
conmon-2.2.1-2.el10
- use proper macros in spec file and simplify - Related: RHEL-111917 Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
+10
-11
@@ -21,7 +21,7 @@ Epoch: 2
|
|||||||
%endif
|
%endif
|
||||||
Version: 2.2.1
|
Version: 2.2.1
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: OCI container runtime monitor
|
Summary: OCI container runtime monitor
|
||||||
URL: https://github.com/containers/%{name}
|
URL: https://github.com/containers/%{name}
|
||||||
# Tarball fetched from upstream
|
# Tarball fetched from upstream
|
||||||
@@ -31,12 +31,10 @@ BuildRequires: go-md2man
|
|||||||
%endif
|
%endif
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: git-core
|
BuildRequires: git-core
|
||||||
BuildRequires: glib2-devel
|
|
||||||
BuildRequires: libseccomp-devel
|
|
||||||
BuildRequires: pkgconfig
|
|
||||||
BuildRequires: systemd-devel
|
|
||||||
BuildRequires: systemd-libs
|
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
BuildRequires: pkgconfig(libsystemd)
|
||||||
|
BuildRequires: pkgconfig(glib-2.0)
|
||||||
|
BuildRequires: pkgconfig(libseccomp)
|
||||||
Requires: glib2
|
Requires: glib2
|
||||||
Requires: systemd-libs
|
Requires: systemd-libs
|
||||||
Requires: libseccomp
|
Requires: libseccomp
|
||||||
@@ -49,10 +47,10 @@ Requires: libseccomp
|
|||||||
sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
|
sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{__make} DEBUGFLAG="-g" LDFLAGS="-Wl,-z,relro -Wl,-z,now" bin/conmon
|
%make_build bin/conmon
|
||||||
|
|
||||||
%if %{with docs}
|
%if %{with docs}
|
||||||
%{__make} GOMD2MAN=go-md2man -C docs
|
%make_build GOMD2MAN=go-md2man -C docs
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@@ -62,9 +60,6 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
|
|||||||
%{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
|
%{__make} PREFIX=%{buildroot}%{_prefix} -C docs install
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
#define license tag if not already defined
|
|
||||||
%{!?_licensedir:%global license %doc}
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc README.md
|
%doc README.md
|
||||||
@@ -75,6 +70,10 @@ sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* 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
|
- update to https://github.com/containers/conmon/releases/tag/v2.2.1
|
||||||
- enable RELRO
|
- enable RELRO
|
||||||
|
|||||||
Reference in New Issue
Block a user