rpms/ghc-rpm-macros/devel ghc-rpm-macros.ghc, 1.27, 1.28 ghc-rpm-macros.spec, 1.30, 1.31

[Jens Petersen]

Author: petersen

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

Modified Files:
	ghc-rpm-macros.ghc ghc-rpm-macros.spec 
Log Message:
- fix ghc_strip_dynlinked when no dynlinked files
- devel should provide doc also when not obsoleting




Index: ghc-rpm-macros.ghc
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.ghc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ghc-rpm-macros.ghc	15 Jul 2010 14:43:34 -0000	1.27
+++ ghc-rpm-macros.ghc	17 Jul 2010 08:08:37 -0000	1.28
@@ -128,7 +128,7 @@ Group:          Development/Libraries\
 %{!-c:%{?ghc_pkg_c_deps:Requires:       %{ghc_pkg_c_deps}}}\
 %{-c:Requires:       %{-c*}}\
 %{-o:Obsoletes:      %{ghc_pkg_name}-doc < %{-o*}}\
-%{-o:Provides:       %{ghc_pkg_name}-doc = %{version}-%{release}}\
+Provides:       %{ghc_pkg_name}-doc = %{version}-%{release}\
 \
 %description -n %{ghc_pkg_name}-devel\
 %{?common_description}%{!?common_description:Haskell %{local_pkg_name} library.}\
@@ -172,7 +172,7 @@ This package contains the profiling libr
 # 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


Index: ghc-rpm-macros.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghc-rpm-macros/devel/ghc-rpm-macros.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ghc-rpm-macros.spec	15 Jul 2010 14:43:34 -0000	1.30
+++ ghc-rpm-macros.spec	17 Jul 2010 08:08:37 -0000	1.31
@@ -1,5 +1,5 @@
 Name:		ghc-rpm-macros
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	Macros for building packages for GHC
 
@@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 16 2010 Jens Petersen <petersen at redhat.com> - 0.8.1-1
+- fix ghc_strip_dynlinked for no dynlinked files
+- devel should provide doc also when not obsoleting
+
 * Fri Jul 16 2010 Jens Petersen <petersen at redhat.com> - 0.8.0-1
 - merge -doc into -devel and provide -o obsoletes doc subpackage option