rpms/mlton/F-13 .cvsignore, 1.11, 1.12 mlton.spec, 1.33, 1.34 sources, 1.11, 1.12 mlton-20070826-arm.patch, 1.1, NONE mlton-20070826-debuginfo.patch, 1.1, NONE

[Adam Goode]

Author: agoode

Update of /cvs/pkgs/rpms/mlton/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16296

Modified Files:
	.cvsignore mlton.spec sources 
Removed Files:
	mlton-20070826-arm.patch mlton-20070826-debuginfo.patch 
Log Message:
* Fri Jun 11 2010 Adam Goode <adam at spicenitz.org> - 20100608-1
- New upstream release, see http://mlton.org/Release20100608



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mlton/F-13/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	31 May 2009 22:57:34 -0000	1.11
+++ .cvsignore	11 Jun 2010 15:48:11 -0000	1.12
@@ -1 +1 @@
-mlton-20070826-1.src.tgz
+mlton-20100608-1.src.tgz


Index: mlton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mlton/F-13/mlton.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- mlton.spec	6 Jan 2010 15:38:58 -0000	1.33
+++ mlton.spec	11 Jun 2010 15:48:11 -0000	1.34
@@ -1,8 +1,8 @@
 %global mlton_bootstrap 0
 
 Name:		mlton
-Version:	20070826
-Release:	20%{?dist}
+Version:	20100608
+Release:	1%{?dist}
 Summary:	Optimizing compiler for Standard ML
 
 Group:		Development/Languages
@@ -12,11 +12,8 @@ Source0:	http://mlton.org/pages/Download
 
 #Source1:	mlton-20070826-1.arm-linux.tgz
 
-Patch0:		mlton-20070826-debuginfo.patch
-Patch1:		mlton-20070826-no-execmem.patch
-Patch2:		mlton-20070826-arm.patch
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		mlton-20070826-no-execmem.patch
+Patch1:		mlton-20100608-no-execstack.patch
 
 BuildRequires:	gmp-devel htmldoc tex(latex)
 %if ! %{mlton_bootstrap}
@@ -25,9 +22,6 @@ BuildRequires:	mlton
 
 Requires:	gmp-devel gcc
 
-# need to bootstrap ppc64 still
-ExcludeArch:	ppc64
-
 
 # description taken from the Debian package by Stephen Weeks
 %description
@@ -41,14 +35,11 @@ multiprecision library, and lots of usef
 %prep
 %setup -q
 
-# disable strip so debuginfo packages work
-%patch0 -p1 -b .debuginfo
+# no execmem (Fedora specific)
+%patch0 -p1 -b .no-execmem
 
-# no execmem
-%patch1 -p1 -b .no-execmem
-
-# ARM
-%patch2 -p1 -b .arm
+# no execstack (already in upstream svn)
+%patch1 -p1 -b .no-execstack
 
 %if %{mlton_bootstrap}
 %setup -T -D -q -a 1
@@ -77,24 +68,13 @@ make OPTFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT MAN_PREFIX_EXTRA=/share \
+make install-no-strip DESTDIR=$RPM_BUILD_ROOT MAN_PREFIX_EXTRA=/share \
 	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,-)
@@ -105,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 11 2010 Adam Goode <adam at spicenitz.org> - 20100608-1
+- New upstream release, see http://mlton.org/Release20100608
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20070826-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mlton/F-13/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	31 May 2009 22:57:34 -0000	1.11
+++ sources	11 Jun 2010 15:48:12 -0000	1.12
@@ -1 +1 @@
-08356566e20f47c1bcc8002fde72c2ec  mlton-20070826-1.src.tgz
+1c365ddefa6ba24e485b028d3ba58136  mlton-20100608-1.src.tgz


--- mlton-20070826-arm.patch DELETED ---


--- mlton-20070826-debuginfo.patch DELETED ---