From 6cc692f6930d47e1f4bb097a03cd950e67ac07cf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Wed, 29 Dec 2010 21:14:10 +0900 Subject: [PATCH] revert disabling debug_package by default --- AUTHORS | 6 +++++- ghc-rpm-macros.ghc | 1 - ghc-rpm-macros.spec | 7 ++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9725c64..adc72fc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,7 @@ +Maintainer: +Jens Petersen + +Initial implementation: Bryan O'Sullivan Jens Petersen -Yaakov Nemoy \ No newline at end of file +Yaakov Nemoy diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index 8e6978e..b57a1c7 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -116,7 +116,6 @@ This package provides the shared library.\ # ghc_package_devel [-n pkgname] [-c cdepslist] [-h pkgdepslist] [-l licensetag] [-v version] (-o deprecated no-op) %ghc_package_devel(n:c:h:l:v:o:)\ -%global debug_package %{nil}\ %define local_pkg_name %{-n:%{-n*}}%{!-n:%{pkg_name}}\ %define ghc_pkg_name ghc-%{local_pkg_name}\ %package -n %{ghc_pkg_name}-devel\ diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 40c3b6a..6fc3156 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.8.2 +Version: 0.8.3 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -48,6 +48,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 29 2010 Jens Petersen - 0.8.3-1 +- revert disabling debug_package, since with redhat-rpm-config installed + the behaviour depended on the position of ghc_lib_package in the spec file + (reported by narasim_7) + * Thu Sep 30 2010 Jens Petersen - 0.8.2-1 - add ghc_pkg_obsoletes for obsoleting old packages - always obsolete -doc packages, but keep -o for now for backward compatibility