diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc index beeba5b..28111ca 100644 --- a/ghc-rpm-macros.ghc +++ b/ghc-rpm-macros.ghc @@ -1,5 +1,3 @@ -%ghc_archs %{ix86} x86_64 ppc - %cabal %{_bindir}/runghc Setup %cabal_configure \ @@ -19,7 +17,7 @@ find ${RPM_BUILD_ROOT}%{pkg_libdir} -type d | sed 's/^/%dir /' >> %1-devel.files find ${RPM_BUILD_ROOT}%{pkg_libdir} ! \\( -type d -o -name '*_p.a' -o -name '*.p_hi' \\) >> %1-devel.files \ echo '%defattr(-,root,root,-)' > %1-prof.files \ find ${RPM_BUILD_ROOT}%{pkg_libdir} \\( -name '*_p.a' -o -name '*.p_hi' \\) >> %1-prof.files \ -sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1.files %1-prof.files \ +sed -i -e "s!${RPM_BUILD_ROOT}!!g" %1-devel.files %1-prof.files \ %{nil} %ghc_gen_scripts %cabal register --gen-script ; %cabal unregister --gen-script diff --git a/ghc.spec b/ghc.spec index 01531d3..57173dc 100644 --- a/ghc.spec +++ b/ghc.spec @@ -16,10 +16,10 @@ Name: ghc Version: 6.10.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Glasgow Haskell Compilation system -# ghc has only been bootstrapped on the following archs for fedora: -ExclusiveArch: %{ix86} x86_64 ppc alpha +# fedora ghc has only been bootstrapped on ix86, x86_64, ppc, alpha: +ExcludeArch: ppc64 License: BSD Group: Development/Languages Source0: http://www.haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2 @@ -218,6 +218,12 @@ fi %endif %changelog +* Fri Feb 27 2009 Jens Petersen - 6.10.1-12 +- drop ghc_archs since it breaks koji +- fix missing -devel in ghc_gen_filelists +- change from ExclusiveArch to ExcludeArch ppc64 since alpha was bootstrapped + by oliver + * Wed Feb 25 2009 Jens Petersen - 6.10.1-11 - use %%ix86 for change from i386 to i586 in rawhide - add ghc_archs macro in macros.ghc for other packages @@ -239,7 +245,7 @@ fi * Mon Jan 19 2009 Jens Petersen - 6.10.1-7 - buildrequire ncurses-devel to fix build of missing editline package needed for ghci line-editing (#478466) -- move spec templates to a haskell-packaging for easy updating +- move spec templates to cabal2spec package for easy updating - provide correct haddock version * Mon Dec 1 2008 Jens Petersen - 6.10.1-6