From a6191711fc3a86a7614a8dd911e7521134dcf61e Mon Sep 17 00:00:00 2001 From: Lakshmi Narasimhan T V Date: Thu, 6 Jan 2011 22:10:48 +0530 Subject: [PATCH] Rebuild for new changes to the way ghc is packaged modified: ghc-hslogger.spec modified: ghc-hslogger.spec modified: ghc-hslogger.spec --- ghc-hslogger.spec | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/ghc-hslogger.spec b/ghc-hslogger.spec index 23ec04c..10e8983 100644 --- a/ghc-hslogger.spec +++ b/ghc-hslogger.spec @@ -6,29 +6,23 @@ %global ghc_pkg_deps ghc-mtl-devel,ghc-network-devel -%bcond_without shared -%bcond_without hscolour - # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 1.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: LGPLv2+ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # fedora ghc archs: ExclusiveArch: %{ix86} x86_64 ppc alpha BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.8.1 -%if %{with hscolour} +BuildRequires: ghc-rpm-macros >= 0.7.3 BuildRequires: hscolour -%endif %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -47,19 +41,19 @@ This package provides the shared library. %install -rm -rf $RPM_BUILD_ROOT %ghc_lib_install mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} install -p -m 644 COPYING ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} -%clean -rm -rf $RPM_BUILD_ROOT - %{?ghc_lib_package} %changelog +* Thu Jan 6 2010 Lakshmi Narasimhan - 1.1.0-6 +- rebuild for new ghc changes +- updating to cabal2spec-0.22.4 + * Sun Dec 5 2010 Jens Petersen - 1.1.0-5 - rebuild