diff --git a/.conmon.metadata b/.conmon.metadata deleted file mode 100644 index edb166f..0000000 --- a/.conmon.metadata +++ /dev/null @@ -1 +0,0 @@ -30cdc2273b6edc5fa16cbf676bb53ae7d6e240f9 SOURCES/conmon-1bddbf7.tar.gz diff --git a/.gitignore b/.gitignore index 18798e9..4b33a06 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/conmon-1bddbf7.tar.gz +v2.1.12.tar.gz diff --git a/SPECS/conmon.spec b/SPECS/conmon.spec deleted file mode 100644 index babc45f..0000000 --- a/SPECS/conmon.spec +++ /dev/null @@ -1,85 +0,0 @@ -%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 commit0 1bddbf7051a973f4a4fecf06faa0c48e82f1e9e1 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global git0 https://%{import_path} - -Name: %{repo} -Epoch: 2 -Version: 2.0.15 -Release: 1%{?dist} -Summary: OCI container runtime monitor -License: ASL 2.0 -URL: %{git0} -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -BuildRequires: gcc -BuildRequires: git -BuildRequires: glib2-devel -BuildRequires: systemd-devel - -%description -%{summary}. - -%prep -%autosetup -Sgit -n %{name}-%{commit0} - -%build -%{__make} all - -%install -%{__make} PREFIX=%{buildroot}%{_prefix} install - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%files -%license LICENSE -%doc README.md -%{_bindir}/%{name} - -%changelog -* Mon Apr 06 2020 Jindrich Novy - 2:2.0.15-1 -- update to 2.0.15 -- Related: #1821193 - -* Thu Dec 12 2019 Jindrich Novy - 2:2.0.6-1 -- update to 2.0.6 -- Related: RHELPLAN-25139 - -* Tue Dec 10 2019 Jindrich Novy - 2:2.0.5-1 -- update to 2.0.5 -- Related: RHELPLAN-25139 - -* Tue Dec 10 2019 Jindrich Novy - 2:2.0.4-1 -- update to 2.0.4 bugfix release -- Related: RHELPLAN-25139 - -* Wed Nov 20 2019 Jindrich Novy - 2:2.0.3-1.giteb5fa88 -- update to 2.0.3 -- Related: RHELPLAN-25139 - -* Wed Sep 25 2019 Lokesh Mandvekar - 2:2.0.2-0.1.dev.git422ce21 -- build latest upstream master - -* Tue Sep 10 2019 Lokesh Mandvekar - 2:2.0.0-2 -- remove BR: go-md2man since no manpages yet - -* Tue Sep 10 2019 Lokesh Mandvekar - 2:2.0.0-1 -- bump to v2.0.0 - -* Fri May 31 2019 Lokesh Mandvekar - 2:0.2.0-1 -- initial package diff --git a/conmon.spec b/conmon.spec new file mode 100644 index 0000000..b992b65 --- /dev/null +++ b/conmon.spec @@ -0,0 +1,80 @@ +%global with_debug 1 + +%if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%endif + +%if %{defined rhel} +%bcond_with docs +%else +%bcond_without docs +%endif + +Name: conmon +%if %{defined rhel} +Epoch: 3 +%else +Epoch: 2 +%endif +Version: 2.1.12 +License: Apache-2.0 +Release: 4%{?dist} +Summary: OCI container runtime monitor +URL: https://github.com/containers/%{name} +# Tarball fetched from upstream +Source0: %{url}/archive/v%{version}.tar.gz +%if %{with docs} +ExclusiveArch: %{golang_arches_future} +BuildRequires: go-md2man +%endif +BuildRequires: gcc +BuildRequires: git-core +BuildRequires: glib2-devel +BuildRequires: libseccomp-devel +BuildRequires: systemd-devel +BuildRequires: systemd-libs +BuildRequires: make +Requires: glib2 +Requires: systemd-libs +Requires: libseccomp + +%description +%{summary}. + +%prep +%autosetup -Sgit %{name}-%{version} +sed -i 's/install.bin: bin\/conmon/install.bin:/' Makefile + +%build +%{__make} DEBUGFLAG="-g" bin/conmon + +%if %{with docs} +%{__make} GOMD2MAN=go-md2man -C docs +%endif + +%install +%{__make} PREFIX=%{buildroot}%{_prefix} install.bin + +%if %{with docs} +%{__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 +%{_bindir}/%{name} + +%if %{with docs} +%{_mandir}/man8/%{name}.8.gz +%endif + +%changelog +* Fri Jan 17 2025 Jindrich Novy - 3:2.1.12-4 +- Fix spec file, remove crio +- Related: RHEL-58990 diff --git a/sources b/sources new file mode 100644 index 0000000..4b9ce9f --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (v2.1.12.tar.gz) = 06668aa35f5752e3d383f0a2cdf88f7c5056bdef96756aa230279ae25ef1d6b6bfd14888d35907062404670ae85d71d2d7258577abff70b74fa49bff6c2d9d20