From 601aa5ffc199ec8f2ee25da624b9376d8177b8f2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 17 Jul 2010 08:08:37 +0000 Subject: [PATCH] - fix ghc_strip_dynlinked when no dynlinked files - devel should provide doc also when not obsoleting --- ghc-rpm-macros.ghc | 4 ++-- ghc-rpm-macros.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index a091a49..2f99c79 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -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 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 d3c3410..8e788bf 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -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 - 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 - 0.8.0-1 - merge -doc into -devel and provide -o obsoletes doc subpackage option