From 7d6e0ab8e8b689a597e442b5ada1b463b3bb1c27 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly@easycoding.org>
Date: Mar 03 2020 11:55:18 +0000
Subject: Fixed RHBZ#1809407 and RHBZ#1809408.


---

diff --git a/earlyoom-arguments-format.patch b/earlyoom-arguments-format.patch
index e9d7447..a49d4e3 100644
--- a/earlyoom-arguments-format.patch
+++ b/earlyoom-arguments-format.patch
@@ -1,14 +1,3 @@
-From fc2856fa9a701b9bbf9481110843e288b0d66351 Mon Sep 17 00:00:00 2001
-From: Yaroslav Sidlovsky <zawertun@otl.ru>
-Date: Mon, 2 Mar 2020 18:25:19 +0300
-Subject: [PATCH] fix for #164
-
----
- msg.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/msg.c b/msg.c
-index e67d839..4270eeb 100644
 --- a/msg.c
 +++ b/msg.c
 @@ -18,9 +18,9 @@ static void color_log(FILE* f, const char* color, const char* fmt, va_list vl)
@@ -16,10 +5,10 @@ index e67d839..4270eeb 100644
          reset = "";
      }
 -    fprintf(f, color);
-+    fprintf(f, "%s", color);
++    fputs(color, f);
      vfprintf(f, fmt, vl);
 -    fprintf(f, reset);
-+    fprintf(f, "%s", reset);
++    fputs(reset, f);
      // The `reset` control was not flushed out by the
      // newline as it was sent after. Manually flush
      // it now to prevent artifacts when stderr and stdout
diff --git a/earlyoom.spec b/earlyoom.spec
index aa94f3e..4292674 100644
--- a/earlyoom.spec
+++ b/earlyoom.spec
@@ -1,13 +1,15 @@
+%global makeflags PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} SYSTEMDUNITDIR=%{_unitdir}
+
 Name: earlyoom
 Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: MIT
 URL: https://github.com/rfjakob/%{name}
 Summary: Early OOM Daemon for Linux
 Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
-# https://github.com/rfjakob/earlyoom/pull/165
+# https://github.com/rfjakob/earlyoom/commit/eb45dc863a17b27acb3381766cdd31ae625f0022
 Patch100: %{name}-arguments-format.patch
 
 %{?systemd_requires}
@@ -30,10 +32,10 @@ sed -e '/systemctl/d' -i Makefile
 
 %build
 %set_build_flags
-%make_build VERSION=%{version}
+%make_build VERSION=%{version} %{makeflags}
 
 %install
-%make_install PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} SYSTEMDUNITDIR=%{_unitdir}
+%make_install %{makeflags}
 
 %files
 %doc README.md
@@ -53,6 +55,9 @@ sed -e '/systemctl/d' -i Makefile
 %systemd_postun_with_restart %{name}.service
 
 %changelog
+* Tue Mar 03 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.4-2
+- Fixed RHBZ#1809407 and RHBZ#1809408.
+
 * Mon Mar 02 2020 Vitaly Zaitsev <vitaly@easycoding.org> - 1.4-1
 - Updated to version 1.4.