diff --git a/ghc-regex-posix.spec b/ghc-regex-posix.spec index 96c17b4..5f3e57e 100644 --- a/ghc-regex-posix.spec +++ b/ghc-regex-posix.spec @@ -14,18 +14,18 @@ Name: ghc-%{pkg_name} # part of haskell-platform-2010.1.0.0 Version: 0.94.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} Group: System Environment/Libraries License: BSD URL: http://hackage.haskell.org/cgi-bin/hackage-scripts/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-rpm-macros >= 0.5.1 -BuildRequires: ghc-doc -BuildRequires: ghc-prof +BuildRequires: ghc, ghc-doc, ghc-prof +BuildRequires: ghc-rpm-macros >= 0.7.0 %{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} %description @@ -43,16 +43,12 @@ This package provides the shared library. %build -%cabal_configure --ghc -p -%cabal build -%cabal haddock +%ghc_lib_build %install -%cabal_install -%cabal_pkg_conf - -%ghc_gen_filelists +rm -rf $RPM_BUILD_ROOT +%ghc_lib_install %clean @@ -60,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 26 2010 Jens Petersen - 0.94.1-4 +- sync cabal2spec-0.22 + * Tue Apr 27 2010 Jens Petersen - 0.94.1-3 - rebuild against ghc-6.12.2 - condition ghc_lib_package