diff --git a/sdcc.spec b/sdcc.spec index be6dab0..6dca8b6 100644 --- a/sdcc.spec +++ b/sdcc.spec @@ -1,6 +1,6 @@ Name: sdcc Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Small Device C Compiler Group: Applications/Engineering License: GPLv2+ @@ -17,6 +17,7 @@ BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: gc-devel +BuilDrequires: gputils BuildRequires: lyx BuildRequires: latex2html @@ -59,6 +60,26 @@ Emacs extensions for SDCC. #%%patch2 -p1 find -name '*.[ch]' -exec chmod -x '{}' \; +# Extract %%__os_install_post into os_install_post~ +cat << \EOF > os_install_post~ +%__os_install_post +EOF + +# Generate customized brp-*scripts +cat os_install_post~ | while read a x y; do +case $a in +# Prevent brp-strip* from trying to handle foreign binaries +*/brp-strip*) + b=$(basename $a) + sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b + chmod a+x $b + ;; +esac +done + +sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ +< os_install_post~ > os_install_post + %build # Rebuild configure scripts (patched configure.in s in patch0). @@ -116,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 1 2009 Conrad Meyer - 2.9.0-2 +- Fix #454205 by BR'ing gputils and re-adding install_post hack. + * Thu Apr 30 2009 Conrad Meyer - 2.9.0-1 - Bump to 2.9.0.