Accepting request 777862 from home:13ilya:branches:Base:System

- Add "Web\ Content" before "firefox" in --prefer parameter.
- Manual optimizations in spec-file.

OBS-URL: https://build.opensuse.org/request/show/777862
OBS-URL: https://build.opensuse.org/package/show/Base:System/earlyoom?expand=0&rev=16
This commit is contained in:
OBS User embar- 2020-02-21 16:23:48 +00:00 committed by Git OBS Bridge
parent ef74d3a0b5
commit cb1d0e88da
3 changed files with 12 additions and 9 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 21 06:55:10 UTC 2020 - Илья Индиго <ilya@ilya.pp.ua>
- Add "Web\ Content" before "firefox" in --prefer parameter.
- Manual optimizations in spec-file.
-------------------------------------------------------------------
Thu Feb 20 18:13:08 UTC 2020 - opensuse@trummer.xyz

View File

@ -19,13 +19,11 @@
%if ! 0%{?_fillupdir:1}
%global _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: earlyoom
Version: 1.3
Release: 0
Summary: Early OOM Daemon for Linux
License: MIT
Group: System/Daemons
URL: https://github.com/rfjakob/earlyoom
Source0: https://github.com/rfjakob/earlyoom/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source11: earlyoom.sysconfig
@ -52,21 +50,20 @@ sed -ri '/LDFLAGS/ s|$| -lrt|' Makefile
%build
CFLAGS='%{optflags} -DVERSION=\"%{version}\" -std=gnu99'
make %{?_smp_mflags} CFLAGS="$CFLAGS"
%make_build CFLAGS="$CFLAGS"
%install
%make_install PREFIX=%{_prefix} SYSTEMDUNITDIR=%{_unitdir}
install -D -m644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.%{name}
# Files list
%files
%license LICENSE
%doc MANPAGE.md README.md
%{_bindir}/earlyoom
%{_bindir}/%{name}
%{_unitdir}/%{name}.service
%exclude %{_sysconfdir}/default/earlyoom
%exclude %{_sysconfdir}/default/%{name}
%{_fillupdir}/sysconfig.%{name}
%{_mandir}/man1/earlyoom.1%{?ext_man}
%{_mandir}/man1/%{name}.1%{?ext_man}
%pre
%{service_add_pre %{name}.service}

View File

@ -2,11 +2,11 @@
## Description: configuration for Early OOM Daemon
## Type: string
## Default: "-r 3 -m 6 -s 10 -n -p --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|ssdm|kdm|gdm|lightdm|plasmashell|kwin_x11|ssh|yast|yast2|y2controlcenter|zypper|rpm)$' --prefer '(^|/)(java|firefox|chromium|chrome|opera|ffmpeg|vlc|akregator|thumbnail.so)$'"
## Default: "-r 3 -m 6 -s 10 -n -p --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|ssdm|kdm|gdm|lightdm|plasmashell|kwin_x11|ssh|yast|yast2|y2controlcenter|zypper|rpm)$' --prefer '(^|/)(java|Web\ Content|firefox|chromium|chrome|opera|ffmpeg|vlc|akregator|thumbnail.so)$'"
## Config: earlyoom
#
# Command-line options to pass to earlyoom
#
# see man(1) earlyoom
#
EARLYOOM_ARGS="-r 3 -m 6 -s 10 -n -p --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|ssdm|kdm|gdm|lightdm|plasmashell|kwin_x11|ssh|yast|yast2|y2controlcenter|zypper|rpm)$' --prefer '(^|/)(java|firefox|chromium|chrome|opera|falkon|ffmpeg|vlc|mpv|akregator|thumbnail.so)$'"
EARLYOOM_ARGS="-r 3 -m 6 -s 10 -n -p --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|ssdm|kdm|gdm|lightdm|plasmashell|kwin_x11|ssh|yast|yast2|y2controlcenter|zypper|rpm)$' --prefer '(^|/)(java|Web\ Content|firefox|chromium|chrome|opera|falkon|ffmpeg|vlc|mpv|akregator|thumbnail.so)$'"