diff --git a/earlyoom.changes b/earlyoom.changes index 60dfe44..487cd1b 100644 --- a/earlyoom.changes +++ b/earlyoom.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Dec 3 14:12:54 UTC 2020 - Dan Čermák + +- New upstream release 1.6.2 + * Double-check memory situation before killing victim ([commit](https://github.com/rfjakob/earlyoom/commit/e34e0fcec5d9f60eb19a48a3ec2bab175818fdd8)) + * Never terminate ourselves ([#205](https://github.com/rfjakob/earlyoom/issues/205)) + * Dump buffer on /proc/meminfo conversion error ([#214](https://github.com/rfjakob/earlyoom/issues/214)) +- Remove invalid Recommends of libnotify-tools (boo#1179537) +- disable tests +- add link from /sbin/rcearlyoom to /sbin/service + ------------------------------------------------------------------- Thu Sep 17 08:19:35 UTC 2020 - Dan Čermák diff --git a/earlyoom.spec b/earlyoom.spec index 7124a40..0116c4a 100644 --- a/earlyoom.spec +++ b/earlyoom.spec @@ -16,35 +16,28 @@ # -# the tests fail on i586 and ppc, see: -# https://github.com/rfjakob/earlyoom/issues/221 -%ifarch x86_64 %arm aarch64 -%bcond_without tests -%else +# the tests are quite flaky in a VM %bcond_with tests -%endif - %if ! 0%{?_fillupdir:1} %global _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: earlyoom -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: Early OOM Daemon for Linux License: MIT Group: System/Daemons URL: https://github.com/rfjakob/%{name} -Source0: %{URL}/earlyoom/archive/v%{version}.tar.gz +Source0: %{URL}/archive/v%{version}.tar.gz Source11: %{name}.sysconfig # pandoc only for `pandoc MANPAGE.md -s -t man > earlyoom.1` BuildRequires: pandoc BuildRequires: pkgconfig BuildRequires: pkgconfig(systemd) +Conflicts: oomd %if %{with tests} BuildRequires: go %endif -Recommends: libnotify%{?suse_version:-tools} -Conflicts: oomd %description earlyoom checks the amount of available memory and free swap, and if both are @@ -59,8 +52,10 @@ 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' @@ -77,6 +72,9 @@ LDFLAGS="-lrt ${RPM_LD_FLAGS}" %make_install PREFIX=%{_prefix} SYSTEMDUNITDIR=%{_unitdir} install -D -m644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.%{name} +mkdir -p %{buildroot}%{_sbindir} +ln -sf service %{buildroot}%{_sbindir}/rc%{name} + %files %license LICENSE %doc MANPAGE.md README.md @@ -84,6 +82,7 @@ install -D -m644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.%{name} %{_unitdir}/%{name}.service %exclude %{_sysconfdir}/default/%{name} %{_fillupdir}/sysconfig.%{name} +%{_sbindir}/rc%{name} %{_mandir}/man1/%{name}.1%{?ext_man} %pre diff --git a/v1.6.1.tar.gz b/v1.6.1.tar.gz deleted file mode 100644 index a4189e2..0000000 --- a/v1.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcd3fab4da5e1dddec952a0974c866ec90c5f9159c995f9162c45488c4d03340 -size 48200 diff --git a/v1.6.2.tar.gz b/v1.6.2.tar.gz new file mode 100644 index 0000000..3e3bd46 --- /dev/null +++ b/v1.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:227234cf9e77831c21c748bd361e1a7c415e158b96034eacd59e70586779bb6c +size 49006