From dae8fa2606d5ae2baf6b3168506ffbe763b4e59d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 7 Jun 2012 20:14:06 +0900 Subject: [PATCH] let ghc_bin_install take an arg to disable implicit stripping for subpackages --- ghc-rpm-macros.ghc | 5 +++-- ghc-rpm-macros.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 97abdf6..d5f45ed 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -261,11 +261,12 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \ %{nil} # install bin package -%ghc_bin_install\ +%ghc_bin_install()\ %global _use_internal_dependency_generator 0\ %global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\ %cabal_install\ -%ghc_strip_dynlinked +%{!?1:%ghc_strip_dynlinked}\ +%{nil} # ghc_lib_install [name] [version] %ghc_lib_install()\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 64db461..06c9bb9 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -3,7 +3,7 @@ %global macros_file %{_sysconfdir}/rpm/macros.ghc Name: ghc-rpm-macros -Version: 0.94 +Version: 0.95 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -60,6 +60,9 @@ EOF %changelog +* Thu Jun 7 2012 Jens Petersen - 0.95-1 +- let ghc_bin_install take an arg to disable implicit stripping for subpackages + * Thu Jun 7 2012 Jens Petersen - 0.94-1 - allow ghc_description, ghc_devel_description, ghc_devel_post_postun to take args