rpms/mlton/devel mlton.spec,1.1,1.2

[Adam Goode (agoode)]

Author: agoode

Update of /cvs/extras/rpms/mlton/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12611

Modified Files:
	mlton.spec 
Log Message:
turn off bootstrapping


Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/devel/mlton.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlton.spec	9 Jul 2006 13:51:57 -0000	1.1
+++ mlton.spec	10 Jul 2006 12:33:52 -0000	1.2
@@ -1,16 +1,19 @@
+%define mlton_bootstrap 0
+
 Name:		mlton
 Version:	20051202
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
 License:	BSD style and MIT
 URL:		http://mlton.org/
 Source0:	http://mlton.org/pages/Download/attachments/mlton-%{version}-1.src.tgz
-
-# XXX for bootstrapping only, taken from mlton_20060213-1 from Debian
+%if %{mlton_bootstrap}
+# taken from mlton_20060213-1 from Debian
 Source1:	mlton-bootstrap.i386.tar.bz2
 Source2:	mlton-bootstrap.ppc.tar.bz2
+%endif
 
 Patch0:		mlton-pdf-docs.patch
 Patch1:		mlton-debuginfo.patch
@@ -18,8 +21,11 @@
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# XXX put mlton back into BuildRequires after bootstrap
 BuildRequires:	gmp-devel htmldoc tetex-latex which
+%if ! %{mlton_bootstrap}
+BuildRequires:	mlton
+%endif
+
 Requires:	gmp-devel gcc
 
 # not yet available for 64-bit arch
@@ -46,7 +52,7 @@
 # set correct version of PDF guide until this is fixed upstream
 sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
 
-# XXX bootstrap only
+%if %{mlton_bootstrap}
 %ifarch i386
 %setup -T -D -q -a 1
 %endif
@@ -55,12 +61,14 @@
 %endif
 sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/usr\/lib\/mlton/g'  \
 	bootstrap/usr/bin/mlton
+%endif
 
 
 %build
-# XXX bootstrap
+%if %{mlton_bootstrap}
 export MLTON_BOOTSTRAP_DIR=$(pwd)/bootstrap
 export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
+%endif
 
 make
 
@@ -92,6 +100,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jul  9 2006 Adam Goode <adam at spicenitz.org> - 20051202-8
+- Conditionalize bootstrapping and disable it
+
 * Sat Jul  1 2006 Adam Goode <adam at spicenitz.org> - 20051202-7
 - Fix macro in changelog
 - Remove mixed use of tabs and spaces