SPECS: ghc.spec - rel 2; do unregistered build due to ghc own prob...

[arekm]

Author: arekm                        Date: Tue Jun 26 06:22:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; do unregistered build due to ghc own problems with gcc 4.2

---- Files affected:
SPECS:
   ghc.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/ghc.spec
diff -u SPECS/ghc.spec:1.68 SPECS/ghc.spec:1.69
--- SPECS/ghc.spec:1.68	Sun Mar  4 12:32:30 2007
+++ SPECS/ghc.spec	Tue Jun 26 08:22:50 2007
@@ -2,19 +2,21 @@
 #
 # Conditional build:
 %bcond_with	bootstrap	# use foreign (non-rpm) ghc to bootstrap
+# due to http://hackage.haskell.org/trac/ghc/ticket/1427
+%bcond_without	unregistered
 %bcond_without	doc		# don't build documentation (requires haddock)
 #
 Summary:	Glasgow Haskell Compilation system
 Summary(pl.UTF-8):	System kompilacji Glasgow Haskell
 Name:		ghc
-Version:	6.6
-Release:	3
+Version:	6.6.1
+Release:	2
 License:	BSD-like w/o adv. clause
 Group:		Development/Languages
 Source0:	http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src.tar.bz2
-# Source0-md5:	2427a8d7d14f86e0878df6b54938acf7
+# Source0-md5:	ba9f4aec2fde5ff1e1548ae69b78aeb0
 Source1:	http://haskell.org/ghc/dist/%{version}/%{name}-%{version}-src-extralibs.tar.bz2
-# Source1-md5:	14b22fce36caffa509046361724bc119
+# Source1-md5:	43a26b81608b206c056adc3032f7da2a
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-tinfo.patch
 URL:		http://haskell.org/ghc/
@@ -25,20 +27,23 @@
 %{!?with_bootstrap:BuildRequires:	alex >= 2.0}
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_doc:BuildRequires:	docbook-dtd42-xml}
-%{?with_doc:BuildRequires:	docbook-style-xsl}
 BuildRequires:	freealut-devel
 %{!?with_bootstrap:BuildRequires:	ghc}
 BuildRequires:	gmp-devel
-%{?with_doc:BuildRequires:	haddock}
 %{!?with_bootstrap:BuildRequires:	happy >= 1.15}
-%{?with_doc:BuildRequires:	libxslt-progs}
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.213
-%{?with_doc:BuildRequires:	tetex}
-%{?with_doc:BuildRequires:	tetex-dvips}
+%if %{with doc}
+BuildRequires:	docbook-dtd42-xml
+BuildRequires:	docbook-style-xsl
+BuildRequires:	haddock
+BuildRequires:	libxslt-progs
+BuildRequires:	tetex
+BuildRequires:	tetex-dvips
+BuildRequires:	tetex-latex-bibtex
 #For generating documentation in PDF: fop or xmltex
+%endif
 Provides:	haskell
 # there is no more ghc ports in PLD
 ExclusiveArch:	%{ix86} %{x8664} alpha ppc sparc
@@ -146,6 +151,15 @@
 %patch0 -p1
 %patch1 -p1
 
+%if %{with unregistered}
+cat << 'EOF' >> mk/build.mk
+GhcUnregisterised=YES                                                     
+GhcWithNativeCodeGen=NO                                                   
+GhcWithInterpreter=NO                                                     
+SplitObjs=NO
+EOF
+%endif
+
 %build
 %{?with_bootstrap:PATH=$PATH:/usr/local/bin}
 cp -f /usr/share/automake/config.sub .
@@ -168,6 +182,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
 	bindir=$RPM_BUILD_ROOT%{_bindir} \
 	datadir=$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} \
@@ -175,7 +190,9 @@
 
 %if %{with doc}
 rm -rf html
-%{__make} install-docs datadir=`pwd`
+%{__make} install-docs \
+	datadir=`pwd` \
+	mandir=RPM_BUILD_ROOT%{_mandir}
 %endif
 
 %clean
@@ -209,9 +226,11 @@
 %attr(755,root,root) %{_libdir}/ghc-%{version}/unlit
 %{_libdir}/ghc-%{version}/libHS*.a
 %exclude %{_libdir}/ghc-%{version}/libHS*_p.a
+%if ! %{with unregistered}
 %ifarch %{ix86} %{x8664} ppc ppc64 sparc sparcv9 sparc64
 %{_libdir}/ghc-%{version}/HS*.o
 %endif
+%endif
 %{_libdir}/ghc-%{version}/package.conf
 %{_libdir}/ghc-%{version}/*.h
 %{_libdir}/ghc-%{version}/ghc*-usage.txt
@@ -230,6 +249,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2007/06/26 06:22:50  arekm
+- rel 2; do unregistered build due to ghc own problems with gcc 4.2
+
 Revision 1.68  2007/03/04 11:32:30  qrczak
 - Cosmetics.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ghc.spec?r1=1.68&r2=1.69&f=u