diff --git a/.gitattributes b/.gitattributes index f2b6af7..7a752f0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,4 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns -ghc-bootstrap-7.6.3.tar filter=lfs diff=lfs merge=lfs -text +ghc-bootstrap-7.8.3.tar filter=lfs diff=lfs merge=lfs -text diff --git a/README.openSUSE b/README.openSUSE index 8306fb4..1e21312 100644 --- a/README.openSUSE +++ b/README.openSUSE @@ -10,3 +10,8 @@ Generating binary distributions for ghc bootstrap in Factory * https://build.opensuse.org/package/binaries/devel:languages:haskell:bootstrap/ghc-prepare-binary-distributions?repository=openSUSE_Factory_PowerPC_standard 5. Extract tarball `rpm2cpio ghc-prepare-binary-distributions*.rpm | cpio -idmv` 6. Copy tarball to project devel:languages:haskell:compiler/ghc-bootstrap + +Note: +===== +The ix86 and x86_64 tarballs were taken from upstream. +https://www.haskell.org/ghc/download_ghc_7_8_3 diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..bff83ea --- /dev/null +++ b/_constraints @@ -0,0 +1,7 @@ + + + + 8 + + + diff --git a/ghc-bootstrap-7.6.3.tar b/ghc-bootstrap-7.6.3.tar deleted file mode 100644 index 24a3ea6..0000000 --- a/ghc-bootstrap-7.6.3.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3df116adce17289d62cef233f4f3e97ccfde33478fffe80f7cd4ddbb6341e0d4 -size 375603200 diff --git a/ghc-bootstrap-7.8.3.tar b/ghc-bootstrap-7.8.3.tar new file mode 100644 index 0000000..1f8f355 --- /dev/null +++ b/ghc-bootstrap-7.8.3.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:521a6838fb6ee9273a3b6a12ee177066fa03f6e9791d92bc9b5cb61ffb2b4d7a +size 488120320 diff --git a/ghc-bootstrap.changes b/ghc-bootstrap.changes index 12f5616..544288a 100644 --- a/ghc-bootstrap.changes +++ b/ghc-bootstrap.changes @@ -1,10 +1,31 @@ +------------------------------------------------------------------- +Wed Apr 29 09:55:28 UTC 2015 - peter.trommler@ohm-hochschule.de + +- update to 7.8.3 +* provide ppc64le build now +- remove duplicate files +- provides tags for ghc subpackages are no longer needed + we require ghc-bootstrap in ghc.spec +- update README.suse with note on upstream tarballs + +------------------------------------------------------------------- +Fri Apr 17 13:43:27 UTC 2015 - peter.trommler@ohm-hochschule.de + +- add _constraints for ppc64le +* need more disk space + ------------------------------------------------------------------- Thu Mar 26 08:24:04 UTC 2015 - peter.trommler@ohm-hochschule.de - + - use official tarballs for x86 and x86_64 * fixes build on openSUSE 11.4 and SLE 11 * bootstrap ghc is built against libgmp.so.3 +------------------------------------------------------------------- +Mon Sep 22 10:01:46 UTC 2014 - peter.trommler@ohm-hochschule.de + +- fix typo in description + ------------------------------------------------------------------- Mon Sep 22 07:43:07 UTC 2014 - peter.trommler@ohm-hochschule.de diff --git a/ghc-bootstrap.spec b/ghc-bootstrap.spec index b988b23..3728cbd 100644 --- a/ghc-bootstrap.spec +++ b/ghc-bootstrap.spec @@ -2,7 +2,6 @@ # spec file for package ghc-bootstrap # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2015 Peter Trommler peter.trommler@ohm-hochschule.de # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %ifarch %{ix86} %define longarch i386 +%define os_release -centos65 %endif %ifarch ppc %define longarch powerpc @@ -31,14 +30,16 @@ %endif %ifarch x86_64 %define longarch x86_64 +%define os_release -centos65 %endif %global without_hscolour 1 %global debug_package %{nil} + Name: ghc-bootstrap -Version: 7.6.3 +Version: 7.8.3 Release: 0 Url: https://build.opensuse.org/package/view_file/devel:languages:haskell:bootstrap Summary: Binary distributions of The Glorious Glasgow Haskell Compiler @@ -49,42 +50,13 @@ Source1: README.openSUSE Source2: LICENSE BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gmp-devel +BuildRequires: fdupes Requires: gmp-devel -# Building binary distributions is currently broken for ppc64le -# use package 'ghc-bin' to bootstrap ppc64le -# this will be fixed in version 7.8.3 and later -ExclusiveArch: %{ix86} ppc ppc64 x86_64 -Provides: ghc-array -Provides: ghc-base -Provides: ghc-compiler = %{version} -Provides: ghc-containers -Provides: ghc-deepseq -Provides: ghc-directory -Provides: ghc-filepath -Provides: ghc-haskell98 -Provides: ghc-old-locale -Provides: ghc-old-time -Provides: ghc-process -Provides: ghc-time -Provides: ghc-unix -#devel packages -Provides: ghc-array-devel -Provides: ghc-base-devel -Provides: ghc-binary-devel -Provides: ghc-bytestring-devel -Provides: ghc-containers-devel -Provides: ghc-deepseq-devel -Provides: ghc-directory-devel -Provides: ghc-filepath-devel -Provides: ghc-haskell98-devel -Provides: ghc-old-locale-devel -Provides: ghc-old-time-devel -Provides: ghc-pretty-devel -Provides: ghc-process-devel -Provides: ghc-time-devel -Provides: ghc-unix-devel +ExclusiveArch: %{ix86} ppc ppc64 ppc64le x86_64 +Provides: ghc-bootstrap-devel +Conflicts: ghc Conflicts: ghc-compiler Conflicts: ghc-Cabal-devel Conflicts: ghc-array-devel @@ -144,7 +116,7 @@ cp %SOURCE2 . ln -s %{_libdir}/libgmp.so.10 libgmp.so.3 export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH %endif -tar jxf ghc-%{version}-%{longarch}-unknown-linux.tar.bz2 +tar jxf ghc-%{version}-%{longarch}-unknown-linux%{?os_release}.tar.bz2 cd ghc-%{version} ./configure --prefix=%{_prefix} @@ -158,6 +130,7 @@ cd ghc-%{version} install -dm 0755 %{buildroot}%{_libdir} ln -s %{_libdir}/libgmp.so.10 %{buildroot}%{_libdir}/libgmp.so.3 %endif +%fdupes -s %{buildroot} %post ghc-pkg recache @@ -172,7 +145,8 @@ ghc-pkg recache %if 0%{suse_version} > 1130 %{_libdir}/libgmp.so.3 %endif -%ifarch %{ix86} x86_64 +# for some reason there is no manpage for ghc in the x86_64 tarball +%ifarch %{ix86} %{_mandir}/man1/ghc.1* %endif