From fddc4aa22f1aa4befc60c34b009d3f5dc7a0a992 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 17 Jan 2020 22:42:53 +0000 Subject: [PATCH] Use make_build macro The packaging guide[1] says that the make_build macro should be used. This also makes it possible for a build root to inject arguments to make by overriding the __make macro. [1] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make --- vsftpd.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vsftpd.spec b/vsftpd.spec index e82d557..20c3f4f 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -2,7 +2,7 @@ Name: vsftpd Version: 3.0.3 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Very Secure Ftp Daemon # OpenSSL link exception @@ -103,9 +103,9 @@ cp %{SOURCE1} . %build %ifarch s390x sparcv9 sparc64 -make CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe -Wextra -Werror" \ +%make_build CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe -Wextra -Werror" \ %else -make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe -Wextra -Werror" \ +%make_build CFLAGS="$RPM_OPT_FLAGS -fpie -pipe -Wextra -Werror" \ %endif LINK="-pie -lssl" %{?_smp_mflags} @@ -160,6 +160,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub %{_var}/ftp %changelog +* Fri Jan 17 2020 Tom Stellard - 3.0.3-34 +- Use make_build macro + * Thu Nov 28 2019 Ondřej Lysoněk - 3.0.3-33 - Finish up the fix to the problem with bad utmp entries when pututxline() fails - Resolves: rhbz#1688852