From dcf1005d2cca7ce2a541718425f84d65fe8b8d00 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Sep 10 2015 17:31:30 +0000 Subject: newspec: Use %make_build for rpm >= 4.12 http://www.rpm.org/ticket/115 --- diff --git a/NEWS b/NEWS index 7bdc5ce..6474dcf 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +rpmdevtools x.x (201x-xx-xx) + + Ville Skyttä: + - Use %make_build for rpm >= 4.12 in -newspec + rpmdevtools 8.6 (2015-05-10) Ville Skyttä: diff --git a/rpmdev-newspec.in b/rpmdev-newspec.in index d16f9fc..384e1fa 100644 --- a/rpmdev-newspec.in +++ b/rpmdev-newspec.in @@ -253,6 +253,12 @@ if [[ $rpmver -ge 40800 ]] ; then # >= 4.8 s|^make install DESTDIR=\\\$RPM_BUILD_ROOT|%make_install|Mg " fi +if [[ $rpmver -ge 41200 ]] ; then # >= 4.12 + # use %make_build instead of make %{?_smp_mflags} + specfilter+=" + s|^make %\\{?\\?_smp_mflags\\}?|%make_build|Mg +" +fi if [[ $NEWSPEC_PREFER_MACROS ]] ; then # This assumes templates are written using the shell style variables, diff --git a/rpmdevtools.bash-completion.in b/rpmdevtools.bash-completion.in index f80de50..49fb698 100644 --- a/rpmdevtools.bash-completion.in +++ b/rpmdevtools.bash-completion.in @@ -191,7 +191,7 @@ _rpmdev_newspec() ;; -r|--rpm-version) # 4.3: no constructs filtered - COMPREPLY=( $( compgen -W '4.3 4.4 4.6 4.8' -- "$cur" ) ) + COMPREPLY=( $( compgen -W '4.3 4.4 4.6 4.8 4.12' -- "$cur" ) ) return ;; esac