From 2b5418dc4416bb6e41d6ad2c03eaf87d083f2ae4be17a3f8fdff59b0d068ac47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?= =?UTF-8?q?=D0=BE?= Date: Sun, 12 May 2024 19:47:04 +0000 Subject: [PATCH] Accepting request 1173526 from home:13ilya:branches:Base:System - Manual optimizations in spec-file. - Updated to 1.8.2 * Changed file earlyoom.1 (MANPAGE.md -s -t man > earlyoom.1). * https://github.com/rfjakob/earlyoom#changelog * Fixed crash with -p flag in config and IPAddressDeny syntax. OBS-URL: https://build.opensuse.org/request/show/1173526 OBS-URL: https://build.opensuse.org/package/show/Base:System/earlyoom?expand=0&rev=45 --- earlyoom-1.8.2.tar.gz | 3 +++ earlyoom-1.8.tar.gz | 3 --- earlyoom.1 | 2 +- earlyoom.changes | 19 ++++++++++++++----- earlyoom.spec | 18 ++++-------------- 5 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 earlyoom-1.8.2.tar.gz delete mode 100644 earlyoom-1.8.tar.gz diff --git a/earlyoom-1.8.2.tar.gz b/earlyoom-1.8.2.tar.gz new file mode 100644 index 0000000..b08190b --- /dev/null +++ b/earlyoom-1.8.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:13869413dc0d973e454854077be7a2049d350f77a97f6911b654e88dc4b20346 +size 61555 diff --git a/earlyoom-1.8.tar.gz b/earlyoom-1.8.tar.gz deleted file mode 100644 index 5125d6b..0000000 --- a/earlyoom-1.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bbb050a2294e60dafc0b129fcec705ef95d9d27f4c9dae1d3b4f25e4f698ae41 -size 61345 diff --git a/earlyoom.1 b/earlyoom.1 index 59b4e7e..e487cf0 100644 --- a/earlyoom.1 +++ b/earlyoom.1 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pandoc 3.1.12.3 +.\" Automatically generated by Pandoc 3.1.13 .\" .TH "earlyoom" "1" "" "" "General Commands Manual" .SH NAME diff --git a/earlyoom.changes b/earlyoom.changes index 519ddc7..db2fd9e 100644 --- a/earlyoom.changes +++ b/earlyoom.changes @@ -1,10 +1,19 @@ +------------------------------------------------------------------- +Sun May 12 19:42:33 UTC 2024 - Илья Индиго + +- Manual optimizations in spec-file. +- Updated to 1.8.2 + * Changed file earlyoom.1 (MANPAGE.md -s -t man > earlyoom.1). + * https://github.com/rfjakob/earlyoom#changelog + * Fixed crash with -p flag in config and IPAddressDeny syntax. + ------------------------------------------------------------------- Thu Apr 18 16:14:58 UTC 2024 - David B - Removed -p flag from configuration (ineffective for systemd unit). ------------------------------------------------------------------- -Tue Apr 16 06:31:41 UTC 2024 - Илья Индиго <13ilya@gmail.com> +Tue Apr 16 06:31:41 UTC 2024 - Илья Индиго - Updated to 1.8 * Changed file earlyoom.1 (MANPAGE.md -s -t man > earlyoom.1). @@ -17,7 +26,7 @@ Tue Apr 16 06:31:41 UTC 2024 - Илья Индиго <13ilya@gmail.com> to the largest RSS instead of largest oom_score. ------------------------------------------------------------------- -Wed May 18 16:14:43 UTC 2022 - Илья Индиго +Wed May 18 16:14:43 UTC 2022 - Илья Индиго - Refreshed spec-file via spec-cleaner and manual optimizated. * Reduced to the standard github URL. @@ -32,7 +41,7 @@ Wed May 18 16:14:43 UTC 2022 - Илья Индиго * Droped ambient capabilities on startup. ------------------------------------------------------------------- -Thu Nov 18 09:31:29 UTC 2021 - Илья Индиго +Thu Nov 18 09:31:29 UTC 2021 - Илья Индиго - Added GeckoMain in --prefer parameter. (firefox name process) - Removed firefox and chromium in --prefer parameter. (irrelevant) @@ -109,7 +118,7 @@ Thu Mar 19 08:50:17 UTC 2020 - Fabian Vogt - earlyoom.sysconfig: Fix sddm, add kwin_wayland ------------------------------------------------------------------- -Wed Mar 4 17:40:07 UTC 2020 - Илья Индиго +Wed Mar 4 17:40:07 UTC 2020 - Илья Индиго - Add PREFIX=%{_prefix} to %make_build macro for correct ExecStart. - Update to 1.4 @@ -130,7 +139,7 @@ Wed Mar 4 17:40:07 UTC 2020 - Илья Индиго * Fix spurious testsuite failure on systems with a lot of RAM. ------------------------------------------------------------------- -Fri Feb 21 06:55:10 UTC 2020 - Илья Индиго +Fri Feb 21 06:55:10 UTC 2020 - Илья Индиго - Add "Web\ Content" before "firefox" in --prefer parameter. - Manual optimizations in spec-file. diff --git a/earlyoom.spec b/earlyoom.spec index ca402dd..7cae2d5 100644 --- a/earlyoom.spec +++ b/earlyoom.spec @@ -16,13 +16,13 @@ # -# the tests are quite flaky in a VM +# The tests are quite flaky in a VM %bcond_with tests %if ! 0%{?_fillupdir:1} %global _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: earlyoom -Version: 1.8 +Version: 1.8.2 Release: 0 Summary: Early OOM Daemon for Linux License: MIT @@ -30,7 +30,6 @@ Group: System/Daemons URL: https://github.com/rfjakob/%{name} Source0: https://github.com/rfjakob/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.sysconfig -# Inject pre-build earlyoom.1, built on x86_64 machine, as pandoc does not exist on all archs # pandoc MANPAGE.md -s -t man > earlyoom.1 Source2: earlyoom.1 BuildRequires: pkgconfig @@ -46,20 +45,9 @@ below critical level, it will kill the largest process (highest oom_score). %prep %autosetup -p1 -# Test if our pre-build earloom.1 is newer than README.md; if not, fail. -test %{SOURCE2} -nt README.md - -# Fix defaults file location sed -i 's|/default/|/sysconfig/|' earlyoom.service.in - -# remove calls to systemctl in install sed -e '/systemctl/d' -i Makefile -%if %{with tests} -# fix version test -sed -i 's|stderrContains: "earlyoom v",|stderrContains: "earlyoom %{version}",|' testsuite_cli_test.go -%endif - %build CFLAGS='%{?build_cflags}%{!?build_cflags:%optflags} -DVERSION=\"%{version}\" -std=gnu99' CPPFLAGS='%{?build_cxxflags}%{!?build_cxxflags:%optflags}' @@ -67,7 +55,9 @@ LDFLAGS="-lrt ${RPM_LD_FLAGS}" %make_build CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" PREFIX=%{_prefix} %check +test %{SOURCE2} -nt README.md %if %{with tests} +sed -i 's|stderrContains: "earlyoom v",|stderrContains: "earlyoom %{version}",|' testsuite_cli_test.go %make_build test %endif