From 7d50a0215901454f82b5b9a26c5d4bf703d848b0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 20 Dec 2010 19:05:33 +1000 Subject: [PATCH] revert disabling debug_package since it behaves inconsistently with redhat-rpm-config --- ghc-rpm-macros.ghc | 1 - ghc-rpm-macros.spec | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index cacfd83..2fe3ef8 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -114,7 +114,6 @@ This package provides the shared library.\ %global _use_internal_dependency_generator 0\ %global __find_provides /usr/lib/rpm/ghc-deps.sh --provides %{buildroot}%{ghcpkgbasedir}\ %global __find_requires /usr/lib/rpm/ghc-deps.sh --requires %{buildroot}%{ghcpkgbasedir}\ -%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 a6655a8..b315f46 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -1,5 +1,5 @@ Name: ghc-rpm-macros -Version: 0.10.2 +Version: 0.10.3 Release: 1%{?dist} Summary: Macros for building packages for GHC @@ -53,6 +53,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 20 2010 Jens Petersen - 0.10.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) + * Fri Nov 26 2010 Jens Petersen - drop with_devhelp since --html-help option gone from haddock-2.8.0