From 8da46619be1b211d053adb4b01417a44fbe2435275959a4604ba2a6fc669ee67 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Thu, 15 Nov 2012 15:12:53 +0000 Subject: [PATCH 1/4] Accepting request 141432 from home:ptrommler:haskell-platform Finally self bootstrap ghc 7.4.2 in Factory. OBS-URL: https://build.opensuse.org/request/show/141432 OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=124 --- ghc.changes | 5 +++++ ghc.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ghc.changes b/ghc.changes index deebb27..1f2b500 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 13 10:20:38 UTC 2012 - peter.trommler@ohm-hochschule.de + +- selfbootstrap ghc 7.4.2 + ------------------------------------------------------------------- Mon Nov 12 12:53:10 UTC 2012 - peter.trommler@ohm-hochschule.de diff --git a/ghc.spec b/ghc.spec index 1a225e7..109de3f 100644 --- a/ghc.spec +++ b/ghc.spec @@ -17,8 +17,8 @@ # To bootstrap a new version of ghc, uncomment the following: -%global ghc_bootstrapping 1 -%{?ghc_bootstrap} +#%%global ghc_bootstrapping 1 +#%%{?ghc_bootstrap} %global without_hscolour 1 #%%global without_manual 1 @@ -48,6 +48,7 @@ BuildRequires: ghc-process-devel # Alternatively a Keep: line could be added to prjconf %if 0%{?opensuse_bs} BuildRequires: ghc-array-devel +BuildRequires: ghc-base-devel BuildRequires: ghc-binary-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-filepath-devel From fb4018bb677c8c6d4bef6d020f376587cceecd4b50addc458161eadbf80a06f8 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Wed, 28 Nov 2012 11:31:06 +0000 Subject: [PATCH 2/4] - help factory-auto by commenting out currently unneeded BRs OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=125 --- ghc.changes | 5 +++++ ghc.spec | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ghc.changes b/ghc.changes index 1f2b500..ceb3b6d 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 28 08:30:30 UTC 2012 - peter.trommler@ohm-hochschule.de + +- help factory-auto by commenting out currently unneeded BRs + ------------------------------------------------------------------- Tue Nov 13 10:20:38 UTC 2012 - peter.trommler@ohm-hochschule.de diff --git a/ghc.spec b/ghc.spec index 109de3f..b5c7735 100644 --- a/ghc.spec +++ b/ghc.spec @@ -57,18 +57,18 @@ BuildRequires: ghc-old-time-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel %if %{undefined without_hscolour} -BuildRequires: ghc-array -BuildRequires: ghc-base -BuildRequires: ghc-containers -BuildRequires: ghc-deepseq -BuildRequires: ghc-directory -BuildRequires: ghc-filepath -BuildRequires: ghc-haskell98 -BuildRequires: ghc-old-locale -BuildRequires: ghc-old-time -BuildRequires: ghc-process -BuildRequires: ghc-time -BuildRequires: ghc-unix +#BuildRequires: ghc-array +#BuildRequires: ghc-base +#BuildRequires: ghc-containers +#BuildRequires: ghc-deepseq +#BuildRequires: ghc-directory +#BuildRequires: ghc-filepath +#BuildRequires: ghc-haskell98 +#BuildRequires: ghc-old-locale +#BuildRequires: ghc-old-time +#BuildRequires: ghc-process +#BuildRequires: ghc-time +#BuildRequires: ghc-unix %endif %endif BuildRequires: autoconf From d0f8248233792cfdf5eba31d21184ad23e2c740f3d3916e7493c3bc480f287a9 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Mon, 3 Dec 2012 09:36:50 +0000 Subject: [PATCH 3/4] - try to work around factory-auto still thniking we need to wait for BRs even when those are in a comment OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=126 --- ghc.changes | 6 ++++++ ghc.spec | 24 ++++++++++++------------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ghc.changes b/ghc.changes index ceb3b6d..70615f6 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 3 09:33:59 UTC 2012 - peter.trommler@ohm-hochschule.de + +- try to work around factory-auto still thniking we need + to wait for BRs even when those are in a comment + ------------------------------------------------------------------- Wed Nov 28 08:30:30 UTC 2012 - peter.trommler@ohm-hochschule.de diff --git a/ghc.spec b/ghc.spec index b5c7735..dfc5429 100644 --- a/ghc.spec +++ b/ghc.spec @@ -57,18 +57,18 @@ BuildRequires: ghc-old-time-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel %if %{undefined without_hscolour} -#BuildRequires: ghc-array -#BuildRequires: ghc-base -#BuildRequires: ghc-containers -#BuildRequires: ghc-deepseq -#BuildRequires: ghc-directory -#BuildRequires: ghc-filepath -#BuildRequires: ghc-haskell98 -#BuildRequires: ghc-old-locale -#BuildRequires: ghc-old-time -#BuildRequires: ghc-process -#BuildRequires: ghc-time -#BuildRequires: ghc-unix +#Buildres: ghc-array +#Buildres: ghc-base +#Buildres: ghc-containers +#Buildres: ghc-deepseq +#Buildres: ghc-directory +#Buildres: ghc-filepath +#Buildres: ghc-haskell98 +#Buildres: ghc-old-locale +#Buildres: ghc-old-time +#Buildres: ghc-process +#Buildres: ghc-time +#Buildres: ghc-unix %endif %endif BuildRequires: autoconf From 208b77df24cc2b4c481d8a653d093153d155dbed01718d353698f99757da908a Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Mon, 3 Dec 2012 18:25:48 +0000 Subject: [PATCH 4/4] - try to work around factory-auto (again!) OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=127 --- ghc.changes | 2 +- ghc.spec | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ghc.changes b/ghc.changes index 70615f6..f200c87 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Dec 3 09:33:59 UTC 2012 - peter.trommler@ohm-hochschule.de -- try to work around factory-auto still thniking we need +- try to work around factory-auto still thinking we need to wait for BRs even when those are in a comment ------------------------------------------------------------------- diff --git a/ghc.spec b/ghc.spec index dfc5429..b45f525 100644 --- a/ghc.spec +++ b/ghc.spec @@ -57,18 +57,18 @@ BuildRequires: ghc-old-time-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unix-devel %if %{undefined without_hscolour} -#Buildres: ghc-array -#Buildres: ghc-base -#Buildres: ghc-containers -#Buildres: ghc-deepseq -#Buildres: ghc-directory -#Buildres: ghc-filepath -#Buildres: ghc-haskell98 -#Buildres: ghc-old-locale -#Buildres: ghc-old-time -#Buildres: ghc-process -#Buildres: ghc-time -#Buildres: ghc-unix +# array +# base +# containers +# deepseq +# directory +# filepath +# haskell98 +# old-locale +# old-time +# process +# time +# unix %endif %endif BuildRequires: autoconf