From d7e257f745816da1c26c733bb783705cc73529f8 Mon Sep 17 00:00:00 2001 From: konradm Date: Dec 07 2009 03:18:18 +0000 Subject: - Work around rpmbuild failure by disabling brp-strip. --- diff --git a/sdcc.spec b/sdcc.spec index e21b68c..e49dcae 100644 --- a/sdcc.spec +++ b/sdcc.spec @@ -1,6 +1,6 @@ Name: sdcc Version: 2.9.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Small Device C Compiler Group: Applications/Engineering License: GPLv2+ @@ -60,25 +60,9 @@ Emacs extensions for SDCC. %patch3 -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 +# Disable brp-strip for now because it errors trying to strip foreign +# binaries. +%global __os_install_post /usr/lib/rpm/redhat/brp-compress %build @@ -112,6 +96,10 @@ chmod 755 %{name}-$(basename $x) done popd +pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/src/pic16 +find . -type f -name '*.a' -exec chmod 664 '{}' \; +popd + %clean rm -rf $RPM_BUILD_ROOT @@ -137,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 6 2009 Conrad Meyer - 2.9.0-6 +- Work around rpmbuild failure by disabling brp-strip. + * Fri Sep 11 2009 Conrad Meyer - 2.9.0-5 - Fix a bug with single-bit types, logical NOT, and casting to char (I'm fuzzy on the details) that was reported by a Fedora user with the