commit c7a0171a16a7629abebf8711c773da7d521f56e8
Author: Jerry James <loganjerry at gmail.com>
Date: Wed Oct 17 15:32:47 2012 -0600
Rebuild for OCaml 4.00.1.
Update to latest upstream SVN.
Regenerate patch with fuzz.
Drop fix for \textquotesingle; fixed upstream.
.gitignore | 3 +--
mlgmpidl-1.2-Makefile.patch | 6 +++---
ocaml-mlgmpidl.spec | 21 ++++++++++++---------
sources | 2 +-
4 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28de6ce..6acfefb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-mlgmpidl-1.1.tgz
-/mlgmpidl-20120508.tar.gz
+/mlgmpidl-20120830.tar.gz
diff --git a/mlgmpidl-1.2-Makefile.patch b/mlgmpidl-1.2-Makefile.patch
index e964c55..9d053ff 100644
--- a/mlgmpidl-1.2-Makefile.patch
+++ b/mlgmpidl-1.2-Makefile.patch
@@ -1,5 +1,5 @@
---- trunk.old/Makefile 2012-05-08 12:44:05.000000000 +0100
-+++ trunk/Makefile 2012-05-08 13:13:35.219715508 +0100
+--- Makefile.orig 2012-10-17 14:54:46.000000000 -0600
++++ Makefile 2012-10-17 15:10:05.568018643 -0600
@@ -22,16 +22,34 @@
endif
@@ -38,7 +38,7 @@
+-ccopt -L$(MPFR_LIBDIR)
IDLMODULES = mpz mpq mpf mpfr gmp_random
- MLMODULES = $(IDLMODULES) mpzf mpqf mpfrf
+ MLMODULES = $(IDLMODULES) mpzf mpqf mpfrf
@@ -43,12 +61,12 @@
ICFLAGS = \
-I$(GMP_PREFIX)/include \
diff --git a/ocaml-mlgmpidl.spec b/ocaml-mlgmpidl.spec
index 544bea6..e0028fc 100644
--- a/ocaml-mlgmpidl.spec
+++ b/ocaml-mlgmpidl.spec
@@ -6,11 +6,11 @@
%global _enable_debug_package 0
%global debug_package %{nil}
-%global svndate 20120508
+%global svndate 20120830
Name: ocaml-mlgmpidl
-Version: 1.2
-Release: 0.5.%{svndate}%{?dist}
+Version: 1.2.1
+Release: 0.1.%{svndate}%{?dist}
Summary: OCaml interface to GMP and MPFR libraries
Group: Development/Libraries
License: LGPLv2
@@ -18,7 +18,7 @@ ExclusiveArch: %{ocaml_arches}
URL: http://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/
-# There is no official upstream release for 1.2 (although it is tagged
+# There is no official upstream release for 1.2.1 (although it is tagged
# in upstream SVN). So I built this tarball from the upstream
# *trunk*, since it contains additional fixes for OCaml 3.12:
#
@@ -33,7 +33,7 @@ Source2: mlgmpidl_test_result
Patch0: mlgmpidl-1.2-Makefile.patch
-BuildRequires: ocaml >= 3.07
+BuildRequires: ocaml
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-camlidl-devel
@@ -75,10 +75,7 @@ The %{name}-doc package contains documentation for using %{name}.
cp %{SOURCE1} %{SOURCE2} .
# Patch makefile to take custom locations for libraries and installing
-%patch0 -p1
-
-# Fix for undefined control sequence: \textquotesingle
-sed -i '/%\\usepackage{listings}/i\\\\usepackage{textcomp}' mlgmpidl.tex
+%patch0
%build
@@ -157,6 +154,12 @@ cp -pr html %{buildroot}%{doc_dir}
%changelog
+* Wed Oct 17 2012 Jerry James <loganjerry at gmail.com> - 1.2.1-0.1.20120830
+- Rebuild for OCaml 4.00.1
+- Update to latest upstream SVN.
+- Regenerate patch with fuzz.
+- Drop fix for \textquotesingle; fixed upstream.
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.5.20120508
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 8d67de1..f5e7ae8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5f7d2b6e1151829cc77f41ac6627478 mlgmpidl-20120508.tar.gz
+a1f5b1643b5338db65a3c0b5c3533af7 mlgmpidl-20120830.tar.gz