diff --git a/ghc.changes b/ghc.changes index 4738c24..74d91f6 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sat May 19 16:00:19 UTC 2012 - peter.trommler@ohm-hochschule.de + +- don't pack manual page when without_manual is set + +------------------------------------------------------------------- +Sat May 19 11:29:31 UTC 2012 - peter.trommler@ohm-hochschule.de + +- temporarily disable manual to work around broken texlive + +------------------------------------------------------------------- +Thu May 17 07:27:48 UTC 2012 - peter.trommler@ohm-hochschule.de + +- clean up BuildRequires (one per line) +- force gmp-devel >= 5 to get rid of libgmp.so.3 in Factory + ------------------------------------------------------------------- Mon Mar 12 13:34:35 UTC 2012 - peter.trommler@ohm-hochschule.de diff --git a/ghc.spec b/ghc.spec index 7fb56aa..cb55752 100644 --- a/ghc.spec +++ b/ghc.spec @@ -20,6 +20,7 @@ #%%global ghc_bootstrapping 1 #%%{?ghc_bootstrap} #%%global without_hscolour 1 +#%%global without_manual 1 %global debug_package %{nil} @@ -28,7 +29,7 @@ Name: ghc Version: 7.0.4 Release: 1 Group: Development/Languages/Other -License: BSD +License: BSD-3-Clause Url: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2 Summary: The Glorious Glasgow Haskell Compiler %if %{defined ghc_bootstrapping} @@ -36,31 +37,53 @@ BuildRequires: ghc >= 6.10 %else BuildRequires: ghc = %version %endif -BuildRequires: ghc-directory-devel ghc-process-devel ghc-pretty-devel -BuildRequires: ghc-containers-devel ghc-haskell98-devel ghc-bytestring-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-process-devel +BuildRequires: ghc-pretty-devel +BuildRequires: ghc-containers-devel +BuildREquires: ghc-haskell98-devel +BuildRequires: ghc-bytestring-devel BuildRequires: ghc-rpm-macros >= 0.14 # up to ghc-time-devel should be Required by ghc, remove after fix! -BuildRequires: ghc-base-devel ghc-filepath-devel ghc-unix-devel -BuildRequires: ghc-array-devel ghc-old-locale-devel ghc-old-time-devel +BuildRequires: ghc-base-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-unix-devel +BuildRequires: ghc-array-devel +BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-old-time-devel BuildRequires: ghc-random-devel BuildRequires: ghc-time-devel -BuildRequires: gcc pkg-config autoconf +BuildRequires: gcc +BuildRequires: pkg-config +BuildRequires: autoconf BuildRequires: glibc-devel BuildRequires: ncurses-devel -BuildRequires: gmp-devel libffi-devel +BuildRequires: gmp-devel >= 5.0 +BuildRequires: libffi-devel %if %{undefined without_manual} -BuildRequires: libxslt docbook-xsl-stylesheets docbook-utils +BuildRequires: libxslt +BuildRequires: docbook-xsl-stylesheets +BuildRequires: docbook-utils %endif -# FIXME: containers, array and base not pulled in by OBS %if %{undefined without_haddock} && %{undefined without_hscolour} -BuildRequires: hscolour ghc-containers ghc-base ghc-array -BuildRequires: ghc-haskell98 ghc-random ghc-time ghc-process -BuildRequires: ghc-directory ghc-unix ghc-old-time ghc-old-locale +BuildRequires: hscolour +# FIXME: containers, array and base not pulled in by OBS +BuildRequires: ghc-containers +BuildRequires: ghc-base ghc-array +BuildRequires: ghc-haskell98 +BuildRequires: ghc-random +BuildRequires: ghc-time ghc-process +BuildRequires: ghc-directory +BuildRequires: ghc-unix +BuildRequires: ghc-old-time +BuildRequires: ghc-old-locale BuildRequires: ghc-filepath %endif BuildRequires: fdupes PreReq: update-alternatives -Requires: gcc gmp-devel ghc-base-devel +Requires: gcc +Requires: gmp-devel +Requires: ghc-base-devel # Fedora put compiler into ghc-compiler and left ghc empty?! Provides: ghc-compiler = %{version} Source: %{name}-%{version}-src.tar.bz2 @@ -281,7 +304,6 @@ fi %{ghclibdir}/runghc %{ghclibdir}/template-hsc.h %{ghclibdir}/unlit -%{_mandir}/man1/ghc.* %dir %{ghcdocroot} %dir %{ghcdocbasedir} %dir %{ghcdocbasedir}/libraries @@ -296,6 +318,7 @@ fi %{ghcdocbasedir}/Cabal %{ghcdocbasedir}/haddock %{ghcdocbasedir}/users_guide +%{_mandir}/man1/ghc.* %endif %{ghcdocbasedir}/libraries/frames.html %{ghcdocbasedir}/libraries/gen_contents_index