From 9831aa9ea11778ec99419354221edf9ee7a2b4e5 Mon Sep 17 00:00:00 2001
From: Eugene Syromiatnikov <esyr@redhat.com>
Date: Mon, 5 Oct 2020 21:30:38 +0200
Subject: [PATCH] 5.9-1

- v5.8 -> v5.9 (resolves: #1035433).

Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
---
 .gitignore  |  2 +-
 sources     |  2 +-
 strace.spec | 21 +++++++++++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8094382..07c15e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/strace-5.8.tar.xz
+/strace-5.9.tar.xz
diff --git a/sources b/sources
index 371be86..b267f38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (strace-5.8.tar.xz) = 633c3daa2dd3d273839cbb8ebd7f6512a38b39af0d0d89f4676c2067e199f346615406d85e3e13f9e4da8dbeb62095185895ffae986eb99b64775a4287e38f4c
+SHA512 (strace-5.9.tar.xz) = f28d5dcceccb44557b39ed6f295f3250662804dc3ad79959bfadffcecc9b736e532c7c90dc89ebf9d07eb3e02a5ace231605851148ca09d41c8c60dc1ff68206
diff --git a/strace.spec b/strace.spec
index 1a4c440..43da2b8 100644
--- a/strace.spec
+++ b/strace.spec
@@ -1,7 +1,7 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
-Version: 5.8
-Release: 2%{?dist}
+Version: 5.9
+Release: 1%{?dist}
 # The test suite is GPLv2+, all the rest is LGPLv2.1+.
 License: LGPL-2.1+ and GPL-2.0+
 # Some distros require Group tag to be present,
@@ -40,6 +40,12 @@ BuildRequires: pkgconfig(bluez)
 %{?!buildroot:BuildRoot: %_tmppath/buildroot-%name-%version-%release}
 %define maybe_use_defattr %{?suse_version:%%defattr(-,root,root)}
 
+# Fallback definitions for make_build/make_install macros
+%{?!__make:       %global __make %_bindir/make}
+%{?!__install:    %global __install %_bindir/install}
+%{?!make_build:   %global make_build %__make %{?_smp_mflags}}
+%{?!make_install: %global make_install %__make install DESTDIR="%{?buildroot}" INSTALL="%__install -p"}
+
 %description
 The strace program intercepts and records the system calls called and
 received by a running process.  Strace can print a record of each
@@ -55,7 +61,7 @@ received by a process.
 %patch0 -p1
 echo -n %version-%release > .tarball-version
 echo -n 2020 > .year
-echo -n 2020-06-16 > .strace.1.in.date
+echo -n 2020-09-23 > .strace.1.in.date
 
 %build
 echo 'BEGIN OF BUILD ENVIRONMENT INFORMATION'
@@ -71,10 +77,10 @@ echo 'END OF BUILD ENVIRONMENT INFORMATION'
 
 CFLAGS_FOR_BUILD="$RPM_OPT_FLAGS"; export CFLAGS_FOR_BUILD
 %configure --enable-mpers=check
-make %{?_smp_mflags}
+%make_build
 
 %install
-make DESTDIR=%{buildroot} install
+%make_install
 
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_bindir}/strace-graph
@@ -87,7 +93,7 @@ wait
 
 %check
 %{buildroot}%{_bindir}/strace -V
-make %{?_smp_mflags} -k check VERBOSE=1
+%make_build -k check VERBOSE=1
 echo 'BEGIN OF TEST SUITE INFORMATION'
 tail -n 99999 -- tests*/test-suite.log tests*/ksysent.gen.log
 find tests* -type f -name '*.log' -print0 |
@@ -102,6 +108,9 @@ echo 'END OF TEST SUITE INFORMATION'
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 05 2020 Eugene Syromyatnikov <esyr@redhat.com> - 5.9-1
+- v5.8 -> v5.9 (resolves: #1035433).
+
 * Wed Aug 19 2020 Jeff Law <law@redhat.com> - 5.8-2
 - Work around gcc-11 false positive diagnostic