From bf8016d4b68cc070cfdc96ebf44726e7a381e9be Mon Sep 17 00:00:00 2001
From: Adam Goode <agoode@fedoraproject.org>
Date: Nov 25 2006 04:07:47 +0000
Subject: fixes


---

diff --git a/mlton-20051202-pdf-docs.patch b/mlton-20051202-pdf-docs.patch
new file mode 100644
index 0000000..70e703a
--- /dev/null
+++ b/mlton-20051202-pdf-docs.patch
@@ -0,0 +1,64 @@
+diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
+--- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
++++ mlton-20051202/Makefile	2006-06-19 23:26:55.000000000 -0400
+@@ -431,8 +431,8 @@
+ 		; do 							\
+ 		$(CP) $(SRC)/regression/$$f.sml $(TEXM)/; 		\
+ 	done
+-	$(GZIP) -c $(LEX)/$(LEX).ps >$(TDOC)/$(LEX).ps.gz
+-	$(GZIP) -c $(YACC)/$(YACC).ps >$(TDOC)/$(YACC).ps.gz
++	$(CP) $(LEX)/$(LEX).pdf $(TDOC)
++	$(CP) $(YACC)/$(YACC).pdf $(TDOC)
+ 	find $(TDOC)/ -name .svn -type d | xargs rm -rf
+ 	find $(TDOC)/ -name .ignore -type f | xargs rm -rf
+ 	find $(TEXM)/ -name .svn -type d | xargs rm -rf
+diff -ur mlton-20051202~/mllex/Makefile mlton-20051202/mllex/Makefile
+--- mlton-20051202~/mllex/Makefile	2005-10-11 16:47:54.000000000 -0400
++++ mlton-20051202/mllex/Makefile	2006-06-19 22:39:39.000000000 -0400
+@@ -47,7 +47,7 @@
+ 	../bin/clean
+ 
+ .PHONY: docs
+-docs: mllex.ps
++docs: mllex.pdf
+ 
+ .PHONY: test
+ test: $(NAME)
+diff -ur mlton-20051202~/mlyacc/doc/Makefile mlton-20051202/mlyacc/doc/Makefile
+--- mlton-20051202~/mlyacc/doc/Makefile	2005-11-06 15:04:36.000000000 -0500
++++ mlton-20051202/mlyacc/doc/Makefile	2006-06-19 22:47:41.000000000 -0400
+@@ -6,7 +6,7 @@
+  # See the file MLton-LICENSE for details.
+  ##
+ 
+-all: mlyacc.ps
++all: mlyacc.pdf
+ 
+ html/index.html: $(TEX_FILES)
+ 	mkdir -p html
+diff -ur mlton-20051202~/mlyacc/Makefile mlton-20051202/mlyacc/Makefile
+--- mlton-20051202~/mlyacc/Makefile	2005-10-11 16:48:34.000000000 -0400
++++ mlton-20051202/mlyacc/Makefile	2006-06-19 22:48:23.000000000 -0400
+@@ -38,15 +38,21 @@
+ doc/mlyacc.ps:
+ 	$(MAKE) -C doc mlyacc.ps
+ 
++doc/mlyacc.pdf:
++	$(MAKE) -C doc mlyacc.pdf
++
+ mlyacc.ps: doc/mlyacc.ps
+ 	cp doc/mlyacc.ps .
+ 
++mlyacc.pdf: doc/mlyacc.pdf
++	cp doc/mlyacc.pdf .
++
+ .PHONY: clean
+ clean:
+ 	../bin/clean
+ 
+ .PHONY: docs
+-docs: mlyacc.ps
++docs: mlyacc.pdf
+ 
+ .PHONY: test
+ test: $(NAME)
diff --git a/mlton-20061107-debuginfo.patch b/mlton-20061107-debuginfo.patch
new file mode 100644
index 0000000..501fbd3
--- /dev/null
+++ b/mlton-20061107-debuginfo.patch
@@ -0,0 +1,20 @@
+--- mlton-20061107~/Makefile	2006-11-06 20:40:08.000000000 -0500
++++ mlton-20061107/Makefile	2006-11-14 23:19:34.000000000 -0500
+@@ -411,18 +411,7 @@
+ 	if $(GZIP_MAN); then						\
+ 		cd $(TMAN) && $(GZIP) $(MAN_PAGES);			\
+ 	fi
+-	case "$(TARGET_OS)" in						\
+-	aix|cygwin|darwin|solaris)					\
+-	;;								\
+-	*)								\
+-		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
+-			$(TBIN)/$(NLFFIGEN)$(EXE) $(TBIN)/$(PROF)$(EXE)	\
+-			$(TBIN)/$(YACC)$(EXE); do			\
+-			strip --remove-section=.comment			\
+-				--remove-section=.note $$f; 		\
+-		done							\
+-	esac
+ 
+ .PHONY: install-docs
+ install-docs:
diff --git a/mlton-20061107-optflags.patch b/mlton-20061107-optflags.patch
new file mode 100644
index 0000000..25a6e91
--- /dev/null
+++ b/mlton-20061107-optflags.patch
@@ -0,0 +1,96 @@
+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-18 12:27:39.000000000 -0500
+@@ -10,8 +10,9 @@
+ all: interpret.o interpret-gdb.o print-opcodes
+ 
+ CC = gcc -std=gnu99
+-CFLAGS = -fomit-frame-pointer -I../runtime -I../include -Wall
+-DEBUGFLAGS = $(CFLAGS)
++OPTFLAGS = -fomit-frame-pointer
++DEBUGFLAGS = -fomit-frame-pointer
++CFLAGS = -I../runtime -I../include -Wall
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
+ DEBUGFLAGS += -gstabs+
+@@ -20,21 +21,23 @@
+ DEBUGFLAGS += -g2
+ 
+ ifeq ($(TARGET_ARCH), amd64)
+-CFLAGS += -mtune=opteron -m32 
+-endif 
++OPTFLAGS += -mtune=opteron
++CFLAGS += -m32
++endif
+ 
+ ifeq ($(TARGET_OS), freebsd)
+ CFLAGS += -I/usr/local/include
+ endif
+ 
+ interpret.o: interpret.c interpret.h opcode.h
+-	$(CC) $(CFLAGS) -c -O2 interpret.c
++	$(CC) $(CFLAGS) -c -O2 $(OPTFLAGS) interpret.c
+ 
+ interpret-gdb.o: interpret.c interpret.h
+-	$(CC) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
++	$(CC) $(CFLAGS) $(DEBUGFLAGS) -c -o $@ -DASSERT=1 interpret.c
+ 
+ print-opcodes: print-opcodes.c opcode.h
+-	$(CC) $(CFLAGS) -o print-opcodes -I../runtime -L../runtime	\
++	$(CC) $(CFLAGS) $(OPTFLAGS) -o print-opcodes \
++		-I../runtime -L../runtime	\
+ 		print-opcodes.c -lmlton
+ 
+ .PHONY: clean
+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-18 12:29:40.000000000 -0500
+@@ -13,22 +13,25 @@
+ TARGET_OS = $(shell ../bin/host-os)
+ GCC_VERSION = $(shell gcc -v 2>&1 | grep 'gcc version' | sed 's/.*gcc version \(.\).*/\1/')
+ 
+-FLAGS = -fomit-frame-pointer
++OPTFLAGS = -fomit-frame-pointer
++FLAGS =
+ 
+ ifeq ($(TARGET_ARCH), x86)
+ ifneq ($(findstring $(GCC_VERSION), 3 4),)
+-FLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
++OPTFLAGS += -falign-loops=2 -falign-jumps=2 -falign-functions=5
+ else
+-FLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
++OPTFLAGS += -malign-loops=2 -malign-jumps=2 -malign-functions=5
+ endif
+ endif
+ 
+ ifeq ($(TARGET_ARCH), amd64)
+-FLAGS += -mtune=opteron -m32
++OPTFLAGS += -mtune=opteron
++FLAGS += -m32
+ endif
+ 
+ ifeq ($(TARGET_ARCH), sparc)
+-FLAGS += -mcpu=v8 -m32
++OPTFLAGS += -mcpu=v8
++FLAGS += -m32
+ endif
+ 
+ ifeq ($(TARGET_OS), freebsd)
+@@ -36,7 +39,7 @@
+ endif
+ 
+ ifeq ($(TARGET_OS), solaris)
+-FLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
++OPTFLAGS += -Wa,-xarch=v8plusa -funroll-all-loops -mcpu=ultrasparc
+ endif
+ 
+ ifeq ($(TARGET), self)
+@@ -49,7 +52,7 @@
+ endif
+ 
+ CC = gcc -std=gnu99
+-CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS)
++CFLAGS = -O2 -Wall -I. -Iplatform -D_FILE_OFFSET_BITS=64 $(FLAGS) $(OPTFLAGS)
+ DEBUGFLAGS = $(CFLAGS)
+ ifneq ($(TARGET_ARCH), ia64)
+ ifneq ($(TARGET_ARCH), powerpc)
diff --git a/mlton-debuginfo.patch b/mlton-debuginfo.patch
deleted file mode 100644
index f7057b0..0000000
--- a/mlton-debuginfo.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
- 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						\
--	aix|cygwin|darwin|solaris)					\
--	;;								\
--	*)								\
--		for f in $(TLIB)/$(AOUT)$(EXE) $(TBIN)/$(LEX)$(EXE)	\
--			$(TBIN)/$(NLFFIGEN)$(EXE) $(TBIN)/$(PROF)$(EXE)	\
--			$(TBIN)/$(YACC)$(EXE); do			\
--			strip --remove-section=.comment			\
--				--remove-section=.note $$f; 		\
--		done							\
--	esac
- 
- .PHONY: install-docs
- install-docs:
-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)
- ifneq ($(TARGET_ARCH), ia64)
- ifneq ($(TARGET_ARCH), powerpc)
diff --git a/mlton-pdf-docs.patch b/mlton-pdf-docs.patch
deleted file mode 100644
index 70e703a..0000000
--- a/mlton-pdf-docs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur mlton-20051202~/Makefile mlton-20051202/Makefile
---- mlton-20051202~/Makefile	2005-11-30 22:27:06.000000000 -0500
-+++ mlton-20051202/Makefile	2006-06-19 23:26:55.000000000 -0400
-@@ -431,8 +431,8 @@
- 		; do 							\
- 		$(CP) $(SRC)/regression/$$f.sml $(TEXM)/; 		\
- 	done
--	$(GZIP) -c $(LEX)/$(LEX).ps >$(TDOC)/$(LEX).ps.gz
--	$(GZIP) -c $(YACC)/$(YACC).ps >$(TDOC)/$(YACC).ps.gz
-+	$(CP) $(LEX)/$(LEX).pdf $(TDOC)
-+	$(CP) $(YACC)/$(YACC).pdf $(TDOC)
- 	find $(TDOC)/ -name .svn -type d | xargs rm -rf
- 	find $(TDOC)/ -name .ignore -type f | xargs rm -rf
- 	find $(TEXM)/ -name .svn -type d | xargs rm -rf
-diff -ur mlton-20051202~/mllex/Makefile mlton-20051202/mllex/Makefile
---- mlton-20051202~/mllex/Makefile	2005-10-11 16:47:54.000000000 -0400
-+++ mlton-20051202/mllex/Makefile	2006-06-19 22:39:39.000000000 -0400
-@@ -47,7 +47,7 @@
- 	../bin/clean
- 
- .PHONY: docs
--docs: mllex.ps
-+docs: mllex.pdf
- 
- .PHONY: test
- test: $(NAME)
-diff -ur mlton-20051202~/mlyacc/doc/Makefile mlton-20051202/mlyacc/doc/Makefile
---- mlton-20051202~/mlyacc/doc/Makefile	2005-11-06 15:04:36.000000000 -0500
-+++ mlton-20051202/mlyacc/doc/Makefile	2006-06-19 22:47:41.000000000 -0400
-@@ -6,7 +6,7 @@
-  # See the file MLton-LICENSE for details.
-  ##
- 
--all: mlyacc.ps
-+all: mlyacc.pdf
- 
- html/index.html: $(TEX_FILES)
- 	mkdir -p html
-diff -ur mlton-20051202~/mlyacc/Makefile mlton-20051202/mlyacc/Makefile
---- mlton-20051202~/mlyacc/Makefile	2005-10-11 16:48:34.000000000 -0400
-+++ mlton-20051202/mlyacc/Makefile	2006-06-19 22:48:23.000000000 -0400
-@@ -38,15 +38,21 @@
- doc/mlyacc.ps:
- 	$(MAKE) -C doc mlyacc.ps
- 
-+doc/mlyacc.pdf:
-+	$(MAKE) -C doc mlyacc.pdf
-+
- mlyacc.ps: doc/mlyacc.ps
- 	cp doc/mlyacc.ps .
- 
-+mlyacc.pdf: doc/mlyacc.pdf
-+	cp doc/mlyacc.pdf .
-+
- .PHONY: clean
- clean:
- 	../bin/clean
- 
- .PHONY: docs
--docs: mlyacc.ps
-+docs: mlyacc.pdf
- 
- .PHONY: test
- test: $(NAME)
diff --git a/mlton.spec b/mlton.spec
index 699944b..b31f7be 100644
--- a/mlton.spec
+++ b/mlton.spec
@@ -2,7 +2,7 @@
 
 Name:		mlton
 Version:	20061107
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -15,8 +15,9 @@ Source1:	mlton-bootstrap.i386.tar.bz2
 Source2:	mlton-bootstrap.ppc.tar.bz2
 %endif
 
-Patch0:		mlton-pdf-docs.patch
-Patch1:		mlton-debuginfo.patch
+Patch0:		mlton-20051202-pdf-docs.patch
+Patch1:		mlton-20061107-debuginfo.patch
+Patch2:		mlton-20061107-optflags.patch
 
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,12 +46,14 @@ multiprecision library, and lots of useful libraries.
 %setup -q
 
 # instantiate version numbers
-make version
+make version VERSION=%{version}
 
 # build documentation as PDF
-%patch -P 0 -p1
-# enable -g and disable strip so debuginfo packages work
-%patch -P 1 -p1
+%patch -P 0 -p1 -b .pdf-docs
+# disable strip so debuginfo packages work
+%patch -P 1 -p1 -b .debuginfo
+# enable RPM_OPT_FLAGS
+%patch -P 2 -p1 -b .optflags
 
 # set correct version of PDF guide until this is fixed upstream
 sed -i 's/\(^version=\).*$/\1%{version}/g' bin/make-pdf-guide
@@ -73,7 +76,7 @@ export MLTON_BOOTSTRAP_DIR=$(pwd)/bootstrap
 export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
 %endif
 
-make
+make OPTFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -102,7 +105,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mlton
 %{_mandir}/man1/*
 
+
 %changelog
+* Fri Nov 24 2006 Adam Goode <adam@spicenitz.org> - 20061107-2
+- Use RPM_OPT_FLAGS
+- Correctly instantiate version
+- Adjust patches
+
 * Sun Nov 12 2006 Adam Goode <adam@spicenitz.org> - 20061107-1
 - New release, taken from svn://mlton.org/mlton/tags/on-20061107