From e260880f0cdd23cb3b681db439ce4e798194277f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 4 Sep 2010 21:22:09 +1000 Subject: [PATCH] update to ghc-rpm-macros-0.8.1, hscolour and drop doc pkg (cabal2spec-0.22.2) --- ghc-X11-xft.spec | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ghc-X11-xft.spec b/ghc-X11-xft.spec index 253adee..70031e4 100644 --- a/ghc-X11-xft.spec +++ b/ghc-X11-xft.spec @@ -10,13 +10,14 @@ and some Xrender parts. %global ghc_pkg_c_deps libXft-devel %bcond_without shared +%bcond_without hscolour # debuginfo is not useful for ghc %global debug_package %{nil} Name: ghc-%{pkg_name} Version: 0.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -27,7 +28,10 @@ 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.6.0 +BuildRequires: ghc-rpm-macros >= 0.8.1 +%if %{with hscolour} +BuildRequires: hscolour +%endif %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}} @@ -38,33 +42,30 @@ This package provides the shared library. %endif -%{?ghc_lib_package} - - %prep %setup -q -n %{pkg_name}-%{version} %build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build %install rm -rf $RPM_BUILD_ROOT -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists -%ghc_strip_dynlinked +%ghc_lib_install %clean rm -rf $RPM_BUILD_ROOT +%ghc_lib_package -o 0.3-10 + + %changelog +* Sat Sep 4 2010 Jens Petersen - 0.3-10 +- update to latest macros, hscolour and drop doc pkg (cabal2spec-0.22.2) + * Fri Jun 25 2010 Jens Petersen - 0.3-9 - strip shared library (cabal2spec-0.21.4)