Updqate to version 6.10.1

OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=61
This commit is contained in:
Herbert Graeber 2008-11-28 23:07:44 +00:00 committed by Git OBS Bridge
parent 3be5e92d7c
commit 7a75fac6a7
6 changed files with 100 additions and 135 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1840a0f9b873c64cbc244621f78e4e7d4a6b792f75b2d2a57b4c9c20ca741dc2
size 493972

3
ghc-6.10.1-src.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:42c475e5683454f3450bd8312fe90b08c2c06e1a87ce0de5830456dd3b43009b
size 9590409

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ee2f5ba6a46157fc53eae515cb6fa1ed3c5023e7eac15981d92af0af00ee2ba2
size 1912647

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1fc1ff82a555532f1c9d2dc628fd9de5e6ebab2ce6ee9490a34174ceb6f76e6b
size 7092076

View File

@ -1,51 +0,0 @@
--- ./configure.ac.optional-openal 2008-06-16 19:27:17.000000000 +0200
+++ ./configure.ac 2008-08-22 13:36:30.000000000 +0200
@@ -816,6 +816,21 @@
)
AC_SUBST(GhcLibsWithObjectIO)
+dnl ** Enable the building of the OpenAL?
+dnl --------------------------------------------------------------
+AC_ARG_ENABLE(openal,
+[AC_HELP_STRING([--enable-openal],
+[Build OpenAL, a sound library for Haskell. [default=yes]])],
+[ if test x"$enableval" = x"no"; then
+ GhcLibsWithOpenAL=NO
+ else
+ GhcLibsWithOpenAL=YES
+ fi
+],
+[GhcLibsWithOpenAL=YES]
+)
+AC_SUBST(GhcLibsWithOpenAL)
+
dnl ** .NET interop support?
dnl --------------------------------------------------------------
AC_ARG_ENABLE(dotnet,
--- ./mk/config.mk.in.optional-openal 2008-08-22 13:38:18.000000000 +0200
+++ ./mk/config.mk.in 2008-08-22 13:39:08.000000000 +0200
@@ -419,6 +419,11 @@
# Math library
LIBM=@LIBM@
+# Build the OpenAL ?
+#
+GhcLibsWithOpenAL=@GhcLibsWithOpenAL@
+
+
# Build the ObjectIO ?
#
GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
--- ./libraries/Makefile.optional-openal 2008-06-16 19:27:16.000000000 +0200
+++ ./libraries/Makefile 2008-08-22 13:36:30.000000000 +0200
@@ -65,8 +65,10 @@
SUBDIRS += $(wildcard time)
SUBDIRS += $(wildcard OpenGL)
SUBDIRS += $(wildcard GLUT)
+ifeq "$(GhcLibsWithOpenAL)" "YES"
SUBDIRS += $(wildcard OpenAL)
SUBDIRS += $(wildcard ALUT)
+endif
SUBDIRS += $(wildcard stm)
SUBDIRS += $(wildcard xhtml)
SUBDIRS += $(wildcard cgi)

172
ghc.spec
View File

@ -7,83 +7,72 @@
# norootforbuild
Name: ghc
Version: 6.8.3
%define f_version ghc683
Version: 6.10.1
%define f_version ghc6_10_1
Release: 0
Summary: The Glasgow Haskell Compilation system
Summary(de): Das Glasgow-Haskell-Compilation-System
License: BSD style w/o adv. clause
License: BSD3
Group: Development/Languages/Haskell
Source0: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
Source1: http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src-extralibs.tar.bz2
Patch0: ghc-optional-openal.patch
URL: http://haskell.org/ghc/
Provides: array-%{f_version} = 0.1.0.0
Provides: filepath-%{f_version} = 1.1.0.0
Provides: network-%{f_version} = 2.2.0.0
Provides: process-%{f_version} = 1.0.0.1
Provides: template-haskell-%{f_version} = 2.2.0.0
Provides: base-%{f_version} = 3.0.2.0
Provides: GLUT-%{f_version} = 2.1.1.2
Provides: old-locale-%{f_version} = 1.0.0.0
Provides: QuickCheck-%{f_version} = 1.1.0.0
Provides: time-%{f_version} = 1.1.2.1
Provides: bytestring-%{f_version} = 0.9.0.1.1
Provides: array-%{f_version} = 0.2.0.0
Provides: base-%{f_version} = 3.0.3.0
Provides: base-%{f_version} = 4.0.0.0
Provides: bytestring-%{f_version} = 0.9.1.4
Provides: Cabal-%{f_version} = 1.6.0.1
Provides: containers-%{f_version} = 0.2.0.0
Provides: directory-%{f_version} = 1.0.0.2
Provides: editline-%{f_version} = 0.2.1.0
Provides: extensible-exceptions-%{f_version} = 0.1.0.0
Provides: filepath-%{f_version} = 1.1.0.1
Provides: ghc-prim-%{f_version} = 0.1.0.0
Provides: haskell98-%{f_version} = 1.0.1.0
Provides: old-time-%{f_version} = 1.0.0.0
Provides: random-%{f_version} = 1.0.0.0
Provides: unix-%{f_version} = 2.3.0.1
Provides: Cabal-%{f_version} = 1.2.4.0
Provides: haskell-src-%{f_version} = 1.0.1.2
Provides: OpenGL-%{f_version} = 2.2.1.1
Provides: readline-%{f_version} = 1.0.1.0
Provides: xhtml-%{f_version} = 3000.2.0.0
Provides: cgi-%{f_version} = 3001.1.6.0
Provides: hpc-%{f_version} = 0.5.0.1
Provides: packedstring-%{f_version} = 0.1.0.0
Provides: regex-base-%{f_version} = 0.72.0.1
Provides: containers-%{f_version} = 0.1.0.2
Provides: html-%{f_version} = 1.0.1.1
Provides: parallel-%{f_version} = 1.0.0.1
Provides: regex-compat-%{f_version} = 0.71.0.1
Provides: directory-%{f_version} = 1.0.0.1
Provides: HUnit-%{f_version} = 1.2.0.0
Provides: haskell-src-%{f_version} = 1.0.1.3
Provides: hpc-%{f_version} = 0.5.0.2
Provides: html-%{f_version} = 1.0.1.2
Provides: HUnit-%{f_version} = 1.2.0.3
Provides: integer-%{f_version} = 0.1.0.0
Provides: mtl-%{f_version} = 1.1.0.2
Provides: network-%{f_version} = 2.2.0.1
Provides: old-locale-%{f_version} = 1.0.0.1
Provides: old-time-%{f_version} = 1.0.0.1
Provides: packedstring-%{f_version} = 0.1.0.1
Provides: parallel-%{f_version} = 1.1.0.0
Provides: parsec-%{f_version} = 2.1.0.1
Provides: regex-posix-%{f_version} = 0.72.0.2
Provides: fgl-%{f_version} = 5.4.2.0
Provides: mtl-%{f_version} = 1.1.0.1
Provides: pretty-%{f_version} = 1.0.0.0
Provides: stm-%{f_version} = 2.1.1.1
%if 0%{?suse_version} >= 1020
Provides: ALUT-${f_version} = 2.1.0.0
Provides: OpenAL-${f_version} = 1.3.1.1
%endif
Provides: pretty-%{f_version} = 1.0.1.0
Provides: process-%{f_version} = 1.0.1.0
Provides: QuickCheck-%{f_version} = 1.2.0.0
Provides: random-%{f_version} = 1.0.0.1
Provides: regex-base-%{f_version} = 0.72.0.2
Provides: regex-compat-%{f_version} = 0.71.0.1
Provides: regex-posix-%{f_version} = 0.72.0.3
Provides: stm-%{f_version} = 2.1.1.2
Provides: syb-%{f_version} = 0.1.0.0
Provides: template-haskell-%{f_version} = 2.3.0.0
Provides: time-%{f_version} = 1.1.2.2
Provides: unix-%{f_version} = 2.3.1.0
Provides: xhtml-%{f_version} = 3000.2.0.
PreReq: update-alternatives
Requires: gmp-devel
Requires: readline-devel
Requires: libedit-devel
Requires: update-alternatives
BuildRequires: ghc >= 5.0
BuildRequires: happy >= 1.15
BuildRequires: alex >= 2.0
BuildRequires: ncurses-devel
BuildRequires: gmp-devel
BuildRequires: readline-devel
BuildRequires: xorg-x11-Mesa-devel
BuildRequires: freeglut-devel
BuildRequires: libedit-devel
%if 0%{?suse_version} > 1020
BuildRequires: texlive-latex
%else
BuildRequires: te_latex
%endif
BuildRequires: haddock
BuildRequires: libxslt
BuildRequires: sgml-skel
BuildRequires: docbook-xsl-stylesheets
BuildRequires: docbook-utils
%if 0%{?suse_version} >= 1020
BuildRequires: openal
BuildRequires: freealut
%endif
BuildRequires: update-alternatives
BuildRequires: java-1_5_0-sun
BuildRequires: fop
@ -99,9 +88,6 @@ Provides: haskell_compiler
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /usr
# return use inversed values for booleans (= 0: true, !=0: false)
%define check_haddock_ghc %(test `haddock --ghc-version` != %version; echo $?)
%description
Haskell is the standard purely functional programming language; the
current language version is Haskell 98, agreed in December 1998.
@ -121,10 +107,47 @@ Haskell home page at <http://www.haskell.org/>.
%package prof
Summary: Profiling libraries for GHC
Summary(de): Profiling-Libraries für GHC
Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Provides: GHC-prof = %{version}
Provides: ghc-prof = %{version}
Provides: array-%{f_version}-prof = 0.2.0.0
Provides: base-%{f_version}-prof = 3.0.3.0
Provides: base-%{f_version}-prof = 4.0.0.0
Provides: bytestring-%{f_version}-prof = 0.9.1.4
Provides: Cabal-%{f_version}-prof = 1.6.0.1
Provides: containers-%{f_version}-prof = 0.2.0.0
Provides: directory-%{f_version}-prof = 1.0.0.2
Provides: editline-%{f_version}-prof = 0.2.1.0
Provides: extensible-exceptions-%{f_version}-prof = 0.1.0.0
Provides: filepath-%{f_version}-prof = 1.1.0.1
Provides: ghc-prim-%{f_version}-prof = 0.1.0.0
Provides: haskell98-%{f_version}-prof = 1.0.1.0
Provides: haskell-src-%{f_version}-prof = 1.0.1.3
Provides: hpc-%{f_version}-prof = 0.5.0.2
Provides: html-%{f_version}-prof = 1.0.1.2
Provides: HUnit-%{f_version}-prof = 1.2.0.3
Provides: integer-%{f_version}-prof = 0.1.0.0
Provides: mtl-%{f_version}-prof = 1.1.0.2
Provides: network-%{f_version}-prof = 2.2.0.1
Provides: old-locale-%{f_version}-prof = 1.0.0.1
Provides: old-time-%{f_version}-prof = 1.0.0.1
Provides: packedstring-%{f_version}-prof = 0.1.0.1
Provides: parallel-%{f_version}-prof = 1.1.0.0
Provides: parsec-%{f_version}-prof = 2.1.0.1
Provides: pretty-%{f_version}-prof = 1.0.1.0
Provides: process-%{f_version}-prof = 1.0.1.0
Provides: QuickCheck-%{f_version}-prof = 1.2.0.0
Provides: random-%{f_version}-prof = 1.0.0.1
Provides: regex-base-%{f_version}-prof = 0.72.0.2
Provides: regex-base-%{f_version}-prof = 0.72.0.2
Provides: regex-compat-%{f_version}-prof = 0.71.0.1
Provides: regex-posix-%{f_version}-prof = 0.72.0.3
Provides: stm-%{f_version}-prof = 2.1.1.2
Provides: syb-%{f_version}-prof = 0.1.0.0
Provides: template-haskell-%{f_version}-prof = 2.3.0.0
Provides: time-%{f_version}-prof = 1.1.2.2
Provides: unix-%{f_version}-prof = 2.3.1.0
Provides: xhtml-%{f_version}-prof = 3000.2.0.
%description prof
Profiling libraries for Glorious Glasgow Haskell Compilation System (GHC).
@ -132,7 +155,6 @@ They should be installed when GHC's profiling subsystem is needed.
%package doc
Summary: Documentation for GHC
Summary(de): Dokumentation für GHC
Group: Development/Languages/Haskell
%description doc
@ -150,7 +172,6 @@ the documentation is available online at
%prep
%setup -q -b 1
%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@ -163,9 +184,6 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
--includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} \
--localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
--infodir=%{_infodir} \
%if 0%{?suse_version} < 1020
--enable-openal=no \
%endif
%ifarch x86_64 amd64 ia32e
--enable-libsuffix=64
%endif
@ -184,29 +202,25 @@ psdir := $(docdir)
EOF
make %{?jobs:-j%jobs} all datadir="${_docdir}/%{name}-doc"
%if %check_haddock_ghc
make html
make -C libraries HADDOCK_DOCS=YES
( cd libraries/Cabal && docbook2html doc/Cabal.xml --output doc/Cabal )
make -C docs/storage-mgt ps
%endif
%install
mkdir html-docs
%if %check_haddock_ghc
make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-doc HADDOCK_DOCS=YES install install-docs
cp -a %{buildroot}%{_docdir}/%{name}-doc/index.html html-docs
%else
make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name}-doc install
%endif
cp -a %{buildroot}%{_docdir}/%{name}-doc/libraries html-docs
#mv %{buildroot}%{_prefix}/bin/hsc2hs %{buildroot}%{_prefix}/bin/hsc2hs-ghc
mv %{buildroot}%{_prefix}/bin/hsc2hs %{buildroot}%{_prefix}/bin/hsc2hs-ghc
dir=`pwd`
pushd %{buildroot}
libdir=`echo %{prefix}/%{_lib} | sed 's|^/||'`
libdir=`echo %{_libdir}/%{name}-%{version} | sed 's|^/||'`
find $libdir -type d -print | \
sed 's|^|%dir /|' > $dir/rpm-noprof-lib-files
find $libdir ! -type d ! -name '*.p_hi' ! -name '*_p.a' -print | \
sed 's|^|/|' > $dir/rpm-noprof-lib-files
sed 's|^|/|' >> $dir/rpm-noprof-lib-files
find $libdir ! -type d \( -name '*.p_hi' -or -name '*_p.a' \) -print | \
sed 's|^|/|' > $dir/rpm-prof-lib-files
popd
@ -239,18 +253,16 @@ fi
%{_bindir}/ghc-pkg-%{version}
%{_bindir}/ghci
%{_bindir}/ghci-%{version}
%{_bindir}/ghcprof
%{_bindir}/hasktags
%{_bindir}/hp2ps
%{_bindir}/hpc
%{_bindir}/hsc2hs
%{_bindir}/hsc2hs-ghc
%{_bindir}/hsc2hs-ghc-%{version}
%{_bindir}/runghc
%{_libdir}/ghc-%{version}
%if %check_haddock_ghc
%{_bindir}/runhaskell
%{_bindir}/haddock
%{_mandir}/man1/ghc.1*
%endif
%dir %{_libdir}/ghc-%{version}
%dir %{_libdir}/ghc-%{version}/*
%files prof -f rpm-prof-lib-files
%defattr(-,root,root)
@ -258,7 +270,6 @@ fi
%files doc
%defattr(-,root,root)
%doc html-docs/*
%if %check_haddock_ghc
%doc docs/comm
%doc docs/docbook-cheat-sheet/docbook-cheat-sheet
%doc docs/users_guide/users_guide
@ -266,9 +277,14 @@ fi
%doc docs/storage-mgt/ldv.ps
%doc docs/storage-mgt/rp.ps
%doc docs/storage-mgt/sm.ps
%endif
%changelog
* Mon Nov 25 2008 Herbert Graeber <herbert@links2linux.de> 6.10.1
- add some directories to files list
* Wed Nov 5 2008 Herbert Graeber <herbert@links2linux.de> 6.10.1
- update to version 6.10.1
* Fri Aug 22 2008 Herbert Graeber <herbert@links2linux.de> 6.8.3
- fix the optional-openal patch
- only one job for building documentation