[ghc-rpm-macros/f13/master] fix ghc_strip_dynlinked when no dynlinked files

Jens Petersen petersen at fedoraproject.org
Sat Jul 31 05:39:03 UTC 2010


commit 724cc3449e4510ae4d6c9faaee3a10eb41e34ec4
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat Jul 31 15:38:47 2010 +1000

    fix ghc_strip_dynlinked when no dynlinked files

 ghc-rpm-macros.ghc  |    2 +-
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index a22fdd2..694ed0a 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -201,7 +201,7 @@ This package contains the profiling library.\
 # ghc_strip_dynlinked
 %ghc_strip_dynlinked\
 %if 0%{!?__debug_package:1}\
-find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print | xargs strip\
+find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\
 %endif
 
 # ghc_bin_build
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 29e0ce5..25ce6c8 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.7.1
+Version:	0.7.2
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 31 2010 Jens Petersen <petersen at redhat.com> - 0.7.2-1
+- fix ghc_strip_dynlinked when no dynlinked files
+
 * Mon Jun 28 2010 Jens Petersen <petersen at redhat.com> - 0.7.1-1
 - support hscolour'ing of src from haddock
 - really remove redundant summary and description option flags


More information about the scm-commits mailing list