From cee36b0304a4a67bc2e7558d54a0dfc2bfbb9af4 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jan 23 2025 13:45:49 +0000 Subject: setuptree: Drop unneeded override macros for %__arch_install_post RPM does this all upstream now with RPM 4.19. Also drop commented out make macro setup, %make_build has been around since RPM 4.12. --- diff --git a/rpmdev-setuptree b/rpmdev-setuptree index acd08d9..83cf94e 100755 --- a/rpmdev-setuptree +++ b/rpmdev-setuptree @@ -46,23 +46,6 @@ ISTOP=`grep -c ^$TOPDIR $RPMMACROS` %_topdir %(echo $HOME)/rpmbuild EOF } -# -#MAKE="%make " -#ISTOP=`grep -c ^$MAKE $RPMMACROS` -#[ $ISTOP -lt 1 ] && { -# echo "$MAKE make" >> $RPMMACROS -# } -# -ISTOP=`grep -c ^%__arch_install_post $RPMMACROS` -[ $ISTOP -lt 1 ] && { - cat <<\EOF >> $RPMMACROS - -%__arch_install_post \ - [ "%{buildarch}" = "noarch" ] || QA_CHECK_RPATHS=1 ; \ - case "${QA_CHECK_RPATHS:-}" in [1yY]*) /usr/lib/rpm/check-rpaths ;; esac \ - /usr/lib/rpm/check-buildroot -EOF -} RPMDIR=`rpm --eval "%{_rpmdir}"` SRCDIR=`rpm --eval "%{_sourcedir}"` SPECDIR=`rpm --eval "%{_specdir}"`