From a7cf7e2ec721fb786a73fb9a5dacd5e3644da91d Mon Sep 17 00:00:00 2001
From: Adam Goode <agoode@fedoraproject.org>
Date: Nov 16 2006 06:26:14 +0000
Subject: new upstream


---

diff --git a/.cvsignore b/.cvsignore
index 3850afe..d97cd7e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
-mlton-20051202-1.src.tgz
-mlton-bootstrap.i386.tar.bz2
-mlton-bootstrap.ppc.tar.bz2
+mlton-20061107.tar.bz2
diff --git a/mlton-debuginfo.patch b/mlton-debuginfo.patch
index 3a398fd..f7057b0 100644
--- a/mlton-debuginfo.patch
+++ b/mlton-debuginfo.patch
@@ -1,24 +1,24 @@
-diff -ur mlton-20051202~/bytecode/Makefile mlton-20051202/bytecode/Makefile
---- mlton-20051202~/bytecode/Makefile	2005-11-30 13:36:52.000000000 -0500
-+++ mlton-20051202/bytecode/Makefile	2006-06-25 18:14:13.000000000 -0400
+diff -ur mlton-20061107~/bytecode/Makefile mlton-20061107/bytecode/Makefile
+--- mlton-20061107~/bytecode/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/bytecode/Makefile	2006-11-14 23:18:42.000000000 -0500
 @@ -10,7 +10,7 @@
  all: interpret.o interpret-gdb.o print-opcodes
  
  CC = gcc -std=gnu99
 -CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
 +CFLAGS = -fomit-frame-pointer -g -I../runtime -I../include -Wall
- 
- ifeq ($(TARGET_ARCH), amd64)
- CFLAGS += -mtune=opteron -m32 
-diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
---- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
-+++ mlton-20051202/Makefile	2006-06-25 18:13:45.000000000 -0400
-@@ -402,17 +402,6 @@
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
+diff -ur mlton-20061107~/Makefile mlton-20061107/Makefile
+--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
++++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
+@@ -411,17 +411,6 @@
  	if $(GZIP_MAN); then						\
  		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
  	fi
 -	case "$(TARGET_OS)" in						\
--	cygwin|darwin|solaris)						\
+-	aix|cygwin|darwin|solaris)					\
 -	;;								\
 -	*)								\
 -		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
@@ -31,15 +31,15 @@ diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
  
  .PHONY: install-docs
  install-docs:
-diff -ur mlton-20051202~/runtime/Makefile mlton-20051202/runtime/Makefile
---- mlton-20051202~/runtime/Makefile	2005-11-29 18:05:07.000000000 -0500
-+++ mlton-20051202/runtime/Makefile	2006-06-25 18:13:45.000000000 -0400
+diff -ur mlton-20061107~/runtime/Makefile mlton-20061107/runtime/Makefile
+--- mlton-20061107~/runtime/Makefile	2006-05-13 17:11:02.000000000 -0400
++++ mlton-20061107/runtime/Makefile	2006-11-14 23:20:40.000000000 -0500
 @@ -49,7 +49,7 @@
  endif
  
  CC = gcc -std=gnu99
 -CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
 +CFLAGS = -O2 -Wall -g -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
- DEBUGFLAGS = $(CFLAGS) -gstabs+ -g2
- 
- CFILES = 							\
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
diff --git a/mlton.spec b/mlton.spec
index ad0d24d..699944b 100644
--- a/mlton.spec
+++ b/mlton.spec
@@ -1,14 +1,14 @@
 %define mlton_bootstrap 0
 
 Name:		mlton
-Version:	20051202
-Release:	8%{?dist}.1
+Version:	20061107
+Release:	1%{?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
+Source0:	mlton-%{version}.tar.bz2
 %if %{mlton_bootstrap}
 # taken from mlton_20060213-1 from Debian
 Source1:	mlton-bootstrap.i386.tar.bz2
@@ -21,7 +21,7 @@ Patch1:		mlton-debuginfo.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gmp-devel htmldoc tetex-latex which
+BuildRequires:	gmp-devel htmldoc tetex-latex
 %if ! %{mlton_bootstrap}
 BuildRequires:	mlton
 %endif
@@ -44,6 +44,9 @@ multiprecision library, and lots of useful libraries.
 %prep
 %setup -q
 
+# instantiate version numbers
+make version
+
 # build documentation as PDF
 %patch -P 0 -p1
 # enable -g and disable strip so debuginfo packages work
@@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Nov 12 2006 Adam Goode <adam@spicenitz.org> - 20061107-1
+- New release, taken from svn://mlton.org/mlton/tags/on-20061107
+
 * Thu Aug 31 2006 Adam Goode <adam@spicenitz.org> - 20051202-8.1
 - Mass rebuild
 
diff --git a/sources b/sources
index 3cb09e2..7afc113 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-766b25e39dff36da5f3ed81effd5471b  mlton-20051202-1.src.tgz
-34f8bf4c11cca4867beb3bccab04b0a5  mlton-bootstrap.i386.tar.bz2
-16358b27a8f86ec1aede640fff1c77ff  mlton-bootstrap.ppc.tar.bz2
+eb5766150520d493fe3f76ee83d475c9  mlton-20061107.tar.bz2