rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.21, 1.22 ghc-rpm-macros.spec, 1.24, 1.25

Jens Petersen petersen at fedoraproject.org
Wed Jun 23 10:24:53 UTC 2010


Author: petersen

Update of /cvs/pkgs/rpms/ghc-rpm-macros/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27235

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
make ghc_strip_dynlinked conditional on no debug_package


Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ghc-rpm-macros.ghc	23 Jun 2010 10:05:24 -0000	1.21
+++ ghc-rpm-macros.ghc	23 Jun 2010 10:24:53 -0000	1.22
@@ -201,4 +201,7 @@ This package contains the profiling libr
 %{nil}
 
 # ghc_strip_dynlinked
-%ghc_strip_dynlinked find $RPM_BUILD_ROOT -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print | xargs strip
+%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\
+%endif


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ghc-rpm-macros.spec	23 Jun 2010 10:05:24 -0000	1.24
+++ ghc-rpm-macros.spec	23 Jun 2010 10:24:53 -0000	1.25
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.5.9
+Version:	0.6.0
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 0.6.0-1
+- make ghc_strip_dynlinked conditional on no debug_package
+
 * Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 0.5.9-1
 - replace ghc_strip_shared with ghc_strip_dynlinked
 



More information about the scm-commits mailing list