Hello community, here is the log from the commit of package earlyoom for openSUSE:Factory checked in at 2020-09-17 15:05:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/earlyoom (Old) and /work/SRC/openSUSE:Factory/.earlyoom.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "earlyoom" Thu Sep 17 15:05:01 2020 rev:11 rq:835156 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/earlyoom/earlyoom.changes 2020-09-04 11:12:12.895033837 +0200 +++ /work/SRC/openSUSE:Factory/.earlyoom.new.4249/earlyoom.changes 2020-09-17 15:08:55.920943097 +0200 @@ -1,0 +2,8 @@ +Thu Sep 17 08:19:35 UTC 2020 - Dan Čermák <dcer...@suse.com> + +- Enable tests on x86_64 & ARM +- change reporting interval to never +- remove calls to systemctl in make install +- change LDFLAGS handling via env variables + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ earlyoom.spec ++++++ --- /var/tmp/diff_new_pack.uAStr0/_old 2020-09-17 15:08:57.448944548 +0200 +++ /var/tmp/diff_new_pack.uAStr0/_new 2020-09-17 15:08:57.452944552 +0200 @@ -16,6 +16,14 @@ # +# the tests fail on i586 and ppc, see: +# https://github.com/rfjakob/earlyoom/issues/221 +%ifarch x86_64 %arm aarch64 +%bcond_without tests +%else +%bcond_with tests +%endif + %if ! 0%{?_fillupdir:1} %global _fillupdir %{_localstatedir}/adm/fillup-templates %endif @@ -26,12 +34,15 @@ License: MIT Group: System/Daemons URL: https://github.com/rfjakob/%{name} -Source0: https://github.com/rfjakob/earlyoom/archive/v%{version}.tar.gz +Source0: %{URL}/earlyoom/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) +%if %{with tests} +BuildRequires: go +%endif Recommends: libnotify%{?suse_version:-tools} Conflicts: oomd @@ -45,14 +56,23 @@ # Fix defaults file location sed -i 's|/default/|/sysconfig/|' earlyoom.service.in -# Fix LDFLAGS handling -sed -ri '/LDFLAGS/ s|$| -lrt|' Makefile +# remove calls to systemctl in install +sed -e '/systemctl/d' -i Makefile + +# fix version test +sed -i 's|stderrContains: "earlyoom v",|stderrContains: "earlyoom %{version}",|' testsuite_cli_test.go %build CFLAGS='%{?build_cflags}%{!?build_cflags:%optflags} -DVERSION=\"%{version}\" -std=gnu99' CPPFLAGS='%{?build_cxxflags}%{!?build_cxxflags:%optflags}' +LDFLAGS="-lrt ${RPM_LD_FLAGS}" %make_build CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" PREFIX=%{_prefix} +%check +%if %{with tests} +%make_build test +%endif + %install %make_install PREFIX=%{_prefix} SYSTEMDUNITDIR=%{_unitdir} install -D -m644 %{SOURCE11} %{buildroot}%{_fillupdir}/sysconfig.%{name} ++++++ earlyoom.sysconfig ++++++ --- /var/tmp/diff_new_pack.uAStr0/_old 2020-09-17 15:08:57.480944578 +0200 +++ /var/tmp/diff_new_pack.uAStr0/_new 2020-09-17 15:08:57.480944578 +0200 @@ -9,4 +9,4 @@ # # see man(1) earlyoom # -EARLYOOM_ARGS="-r 3 -m 6 -s 10 -n -p --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|sddm|kdm|gdm|lightdm|plasmashell|kwin_wayland|kwin_x11|ssh|yast|yast2|y2controlcenter|zypper|rpm)$' --prefer '(^|/)(java|Web\ Content|firefox|chromium|chrome|opera|falkon|ffmpeg|vlc|mpv|akregator|thumbnail.so)$'" +EARLYOOM_ARGS="-r 0 -m 6 -s 10 -n -p --avoid '(^|/)(systemd|Xorg|X|Xwayland|xdm|sddm|kdm|gdm|lightdm|plasmashell|kwin_wayland|kwin_x11|ssh|yast|yast2|y2controlcenter|zypper|rpm|dnf)$' --prefer '(^|/)(java|Web\ Content|firefox|chromium|chrome|opera|falkon|ffmpeg|vlc|mpv|akregator|thumbnail.so)$'"
