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
This commit is contained in:
Tom Stellard 2020-01-17 22:42:53 +00:00
parent a9d52cf4e1
commit fddc4aa22f

View File

@ -2,7 +2,7 @@
Name: vsftpd Name: vsftpd
Version: 3.0.3 Version: 3.0.3
Release: 33%{?dist} Release: 34%{?dist}
Summary: Very Secure Ftp Daemon Summary: Very Secure Ftp Daemon
# OpenSSL link exception # OpenSSL link exception
@ -103,9 +103,9 @@ cp %{SOURCE1} .
%build %build
%ifarch s390x sparcv9 sparc64 %ifarch s390x sparcv9 sparc64
make CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe -Wextra -Werror" \ %make_build CFLAGS="$RPM_OPT_FLAGS -fPIE -pipe -Wextra -Werror" \
%else %else
make CFLAGS="$RPM_OPT_FLAGS -fpie -pipe -Wextra -Werror" \ %make_build CFLAGS="$RPM_OPT_FLAGS -fpie -pipe -Wextra -Werror" \
%endif %endif
LINK="-pie -lssl" %{?_smp_mflags} LINK="-pie -lssl" %{?_smp_mflags}
@ -160,6 +160,9 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
%{_var}/ftp %{_var}/ftp
%changelog %changelog
* Fri Jan 17 2020 Tom Stellard <tstellar@redhat.com> - 3.0.3-34
- Use make_build macro
* Thu Nov 28 2019 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-33 * Thu Nov 28 2019 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-33
- Finish up the fix to the problem with bad utmp entries when pututxline() fails - Finish up the fix to the problem with bad utmp entries when pututxline() fails
- Resolves: rhbz#1688852 - Resolves: rhbz#1688852