rpms/sdcc/F-12 sdcc.spec,1.21,1.22

konradm konradm at fedoraproject.org
Mon Dec 7 03:48:21 UTC 2009


Author: konradm

Update of /cvs/pkgs/rpms/sdcc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21747

Modified Files:
	sdcc.spec 
Log Message:
* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
- Work around rpmbuild failure by disabling brp-strip.



Index: sdcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sdcc/F-12/sdcc.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sdcc.spec	24 Nov 2009 18:13:49 -0000	1.21
+++ sdcc.spec	7 Dec 2009 03:48:21 -0000	1.22
@@ -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
@@ -141,8 +125,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Nov 24 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
-- Add back missing chmods to 644 for archives.
+* Sun Dec 6 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-6
+- Work around rpmbuild failure by disabling brp-strip.
 
 * Fri Sep 11 2009 Conrad Meyer <konrad at tylerc.org> - 2.9.0-5
 - Fix a bug with single-bit types, logical NOT, and casting to char




More information about the scm-commits mailing list