rpms/mlton/F-7 mlton-20070826-debuginfo.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 mlton.spec, 1.9, 1.10 sources, 1.3, 1.4 mlton-20051202-pdf-docs.patch, 1.1, NONE mlton-20061107-debuginfo.patch, 1.1, NONE mlton-20061107-optflags.patch, 1.1, NONE
Adam Goode (agoode)
fedora-extras-commits at redhat.com
Sun Sep 30 22:59:11 UTC 2007
Author: agoode
Update of /cvs/extras/rpms/mlton/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12423
Modified Files:
.cvsignore mlton.spec sources
Added Files:
mlton-20070826-debuginfo.patch
Removed Files:
mlton-20051202-pdf-docs.patch mlton-20061107-debuginfo.patch
mlton-20061107-optflags.patch
Log Message:
synchronize devel version to F-7
mlton-20070826-debuginfo.patch:
--- NEW FILE mlton-20070826-debuginfo.patch ---
diff -ur mlton-20070826~/Makefile mlton-20070826/Makefile
--- mlton-20070826~/Makefile 2007-08-26 17:04:14.000000000 -0400
+++ mlton-20070826/Makefile 2007-08-26 18:28:15.000000000 -0400
@@ -430,17 +430,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:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 13 Nov 2006 00:23:17 -0000 1.3
+++ .cvsignore 30 Sep 2007 22:58:38 -0000 1.4
@@ -1 +1 @@
-mlton-20061107.tar.bz2
+mlton-20070826-1.src.tgz
Index: mlton.spec
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/mlton.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mlton.spec 8 Aug 2007 01:53:29 -0000 1.9
+++ mlton.spec 30 Sep 2007 22:58:38 -0000 1.10
@@ -1,23 +1,18 @@
%define mlton_bootstrap 0
Name: mlton
-Version: 20061107
-Release: 3%{?dist}
+Version: 20070826
+Release: 10%{?dist}
Summary: Optimizing compiler for Standard ML
Group: Development/Languages
License: MIT
URL: http://mlton.org/
-Source0: mlton-%{version}.tar.bz2
-%if %{mlton_bootstrap}
-# taken from mlton_20060213-1 from Debian
-Source1: mlton-bootstrap.i386.tar.bz2
-Source2: mlton-bootstrap.ppc.tar.bz2
-%endif
+Source0: http://mlton.org/pages/Download/attachments/%{name}-%{version}-1.src.tgz
+
+#Source1: mlton-20061107-1.ppc-linux.tgz
-Patch0: mlton-20051202-pdf-docs.patch
-Patch1: mlton-20061107-debuginfo.patch
-Patch2: mlton-20061107-optflags.patch
+Patch0: mlton-20070826-debuginfo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,8 +24,8 @@
Requires: gmp-devel gcc
-# not yet available for 64-bit arch (#198764)
-ExcludeArch: x86_64 ppc64
+# need to bootstrap ppc64 still
+ExcludeArch: ppc64
# description taken from the Debian package by Stephen Weeks
@@ -45,35 +40,30 @@
%prep
%setup -q
-# instantiate version numbers
-make version VERSION=%{version}
-
-# build documentation as PDF
-%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
+%patch -P 0 -p1 -b .debuginfo
%if %{mlton_bootstrap}
-%ifarch i386
%setup -T -D -q -a 1
+sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/lib\/mlton/g' \
+ usr/bin/mlton
%endif
-%ifarch ppc
-%setup -T -D -q -a 2
-%endif
-sed -i 's/\(^lib=\).*$/\1\$MLTON_BOOTSTRAP_DIR\/usr\/lib\/mlton/g' \
- bootstrap/usr/bin/mlton
-%endif
+
+# Filter unwanted Requires:
+cat << \EOF > %{name}-req
+#!/bin/sh
+%{__perl_requires} $* |\
+ sed -e '/perl(mltex.thm)/d'
+EOF
+
+%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+chmod +x %{__perl_requires}
%build
%if %{mlton_bootstrap}
-export MLTON_BOOTSTRAP_DIR=$(pwd)/bootstrap
-export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/usr/bin
+export MLTON_BOOTSTRAP_DIR=$(pwd)/usr
+export PATH="${PATH}":$MLTON_BOOTSTRAP_DIR/bin
%endif
make OPTFLAGS="$RPM_OPT_FLAGS"
@@ -82,7 +72,8 @@
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT MAN_PREFIX_EXTRA=/share \
- TDOC=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+ TDOC=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
+ ULIB=%{_lib}/mlton
# remove unecessary regression test
rm -rf $RPM_BUILD_ROOT%{_libdir}/mlton/sml/ckit-lib/regression
@@ -107,8 +98,40 @@
%changelog
-* Fri May 25 2007 Adam Goode <adam at spicenitz.org> - 20061107-2.1
-- ExcludeArch: ppc64
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-10
+- Disable bootstrap
+
+* Thu Sep 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-9
+- Re-bootstrap ppc
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-8
+- Really fix SRPM conditionals
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-7
+- Work around strange SRPM problem in conditionals
+- Fix changelog (forgot release 5?)
+
+* Wed Sep 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-6
+- Build on ppc now that #247407 is fixed
+
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-4
+- Do not condition bootstrap source tag
+
+* Thu Sep 13 2007 Adam Goode <adam at spicenitz.org> - 20070826-3
+- Bootstrap x86_64
+
+* Mon Aug 27 2007 Adam Goode <adam at spicenitz.org> - 20070826-2
+- Exclude ppc for now (GCC internal compiler error!)
+
+* Sun Aug 26 2007 Adam Goode <adam at spicenitz.org> - 20070826-1
+- Update to new release
+
+* Wed Aug 22 2007 Adam Goode <adam at spicenitz.org> - 20061107-4
+- Exclude ppc64 for now
+
+* Wed Aug 22 2007 Adam Goode <adam at spicenitz.org> - 20061107-3
+- Update license tag
+- Rebuild for buildid
* Fri Nov 24 2006 Adam Goode <adam at spicenitz.org> - 20061107-2
- Use RPM_OPT_FLAGS
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlton/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 13 Nov 2006 00:23:17 -0000 1.3
+++ sources 30 Sep 2007 22:58:38 -0000 1.4
@@ -1 +1 @@
-eb5766150520d493fe3f76ee83d475c9 mlton-20061107.tar.bz2
+08356566e20f47c1bcc8002fde72c2ec mlton-20070826-1.src.tgz
--- mlton-20051202-pdf-docs.patch DELETED ---
--- mlton-20061107-debuginfo.patch DELETED ---
--- mlton-20061107-optflags.patch DELETED ---
More information about the fedora-extras-commits
mailing list