[mlton/f12/master: 9/10] Merge branch 'master' into f12

[Adam Goode]

commit 883eafcc119c40b733fe1f02c5b362032a8eaf5b
Merge: 159acd6 e61ce4a
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Jul 30 20:46:42 2010 -0400

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore

 .gitignore                        |    2 +-
 mlton-20070826-arm.patch          |   35 ----------------------------
 mlton-20070826-debuginfo.patch    |   21 -----------------
 mlton-20100608-no-execstack.patch |   12 ++++++++++
 mlton.spec                        |   45 +++++++++++++++---------------------
 sources                           |    2 +-
 6 files changed, 33 insertions(+), 84 deletions(-)
---
diff --cc mlton.spec
index 768a1ff,dbff444..700e3e2
--- a/mlton.spec
+++ b/mlton.spec
@@@ -82,20 -72,10 +75,14 @@@ make install-no-strip DESTDIR=$RPM_BUIL
  	TDOC=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
  	ULIB=%{_lib}/mlton
  
- # remove unecessary regression test
+ # remove unnecessary regression test
  rm -rf $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/regression
  
- # move some documentation around
- mv $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/doc \
- 	$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ckit-lib
- mv $RPM_BUILD_ROOT%{_libdir}/mlton/sml/smlnj-lib/Doc \
- 	$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/smlnj-lib
- 
  
 +%clean
 +rm -rf $RPM_BUILD_ROOT
 +
 +
  %files
  %defattr(-,root,root,-)
  %doc %{_docdir}/%{name}-%{version}