[ocaml-pa-do] New upstream version 0.8.13.
Richard W.M. Jones
rjones at fedoraproject.org
Tue Jul 3 15:32:45 UTC 2012
commit 7f86e63640f6fd3f98328cd19d158aa9544e21d2
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sat Jun 9 15:07:10 2012 +0100
New upstream version 0.8.13.
- Rebuild for OCaml 4.00.0.
- Send some patches for 4.00.0 upstream.
- No *.cmx files upstream.
.gitignore | 1 +
ocaml-pa-do.spec | 32 +++++++++++++-------
pa_do-0.8.13-disable-some-examples.patch | 12 +++++++
pa_do-0.8.13-fix-dynlink-detection.patch | 15 +++++++++
pa_do-0.8.13-fix-examples.patch | 47 ++++++++++++++++++++++++++++++
pa_do-0.8.13-fix-toploop.patch | 12 +++++++
sources | 2 +-
7 files changed, 109 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 455d593..b44cb34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
pa_do-0.8.10.tar.gz
/pa_do-0.8.12_OCaml3.12.tar.gz
+/pa_do-0.8.13_OCaml3.12.tar.gz
diff --git a/ocaml-pa-do.spec b/ocaml-pa-do.spec
index 959c47f..45869e5 100644
--- a/ocaml-pa-do.spec
+++ b/ocaml-pa-do.spec
@@ -2,18 +2,24 @@
%define debug_package %{nil}
Name: ocaml-pa-do
-Version: 0.8.12
-Release: 3%{?dist}
+Version: 0.8.13
+Release: 1%{?dist}
Summary: OCaml syntax extension for delimited overloading
Group: Development/Libraries
License: LGPLv2+ with exceptions
URL: http://forge.ocamlcore.org/projects/pa-do/
-Source0: http://forge.ocamlcore.org/frs/download.php/444/pa_do-%{version}_OCaml3.12.tar.gz
+Source0: ttp://forge.ocamlcore.org/frs/download.php/616/pa_do-%{version}_OCaml3.12.tar.gz
Patch0: ocaml-pa-do-0.8.9-pdfpagelabels-off.patch
+# Fixes for OCaml 4.00.0. Sent upstream on 2012-07-03.
+Patch1: pa_do-0.8.13-disable-some-examples.patch
+Patch2: pa_do-0.8.13-fix-dynlink-detection.patch
+Patch3: pa_do-0.8.13-fix-examples.patch
+Patch4: pa_do-0.8.13-fix-toploop.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
@@ -56,9 +62,13 @@ developing applications that use %{name}.
%prep
-%setup -q -n pa_do-%{version}
+%setup -q -n pa_do-%{version}_OCaml3.12
%patch0 -p2
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
@@ -78,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
-omake install
+omake INSTALL_FLAGS= install
%clean
@@ -89,22 +99,22 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc LICENSE
%{_libdir}/ocaml/pa_do
-%if %opt
-%exclude %{_libdir}/ocaml/pa_do/*.cmx
-%endif
%exclude %{_libdir}/ocaml/pa_do/*.mli
%files devel
%defattr(-,root,root,-)
%doc README
-%if %opt
-%{_libdir}/ocaml/pa_do/*.cmx
-%endif
%{_libdir}/ocaml/pa_do/*.mli
%changelog
+* Tue Jul 3 2012 Richard W.M. Jones <rjones at redhat.com> - 0.8.13-1
+- New upstream version 0.8.13.
+- Rebuild for OCaml 4.00.0.
+- Send some patches for 4.00.0 upstream.
+- No *.cmx files upstream.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/pa_do-0.8.13-disable-some-examples.patch b/pa_do-0.8.13-disable-some-examples.patch
new file mode 100644
index 0000000..6d67332
--- /dev/null
+++ b/pa_do-0.8.13-disable-some-examples.patch
@@ -0,0 +1,12 @@
+diff -ur pa_do-0.8.13_OCaml3.12.old/examples/OMakefile pa_do-0.8.13_OCaml3.12/examples/OMakefile
+--- pa_do-0.8.13_OCaml3.12.old/examples/OMakefile 2011-05-15 09:36:39.000000000 +0100
++++ pa_do-0.8.13_OCaml3.12/examples/OMakefile 2012-07-03 16:15:50.485313921 +0100
+@@ -30,7 +30,7 @@
+ .SCANNER: scan-ocaml-$(p).mli: $(syntax_cmo)
+ SyntaxExtension($(syntax))
+
+-.SUBDIRS: length add_vec ray_tracer first_order_logic comp_assit_proof
++.SUBDIRS: length add_vec ray_tracer
+
+ OCAMLDEPFLAGS += -pp "$(PP_SYNTAX)"
+ OCAMLPPFLAGS += -pp "$(PP_SYNTAX)"
diff --git a/pa_do-0.8.13-fix-dynlink-detection.patch b/pa_do-0.8.13-fix-dynlink-detection.patch
new file mode 100644
index 0000000..1bbd60c
--- /dev/null
+++ b/pa_do-0.8.13-fix-dynlink-detection.patch
@@ -0,0 +1,15 @@
+diff -ur pa_do-0.8.13_OCaml3.12.old/OMakefile pa_do-0.8.13_OCaml3.12/OMakefile
+--- pa_do-0.8.13_OCaml3.12.old/OMakefile 2011-05-15 09:36:39.000000000 +0100
++++ pa_do-0.8.13_OCaml3.12/OMakefile 2012-07-03 16:08:29.387972201 +0100
+@@ -87,8 +87,9 @@
+ .STATIC:
+ OCAML_VERSION = $(split ".", $(shell $(OCAMLC) -version))
+ # Native Dynlink is supported since OCaml 3.11.0:
+- DYNLINK_SUPPORTED = $(and $(ge $(nth 0, $(OCAML_VERSION)), 3), \
+- $(ge $(nth 1, $(OCAML_VERSION)), 11))
++ DYNLINK_SUPPORTED = $(or $(ge $(nth 0, $(OCAML_VERSION)), 4), \
++ $(and $(ge $(nth 0, $(OCAML_VERSION)), 3), \
++ $(ge $(nth 1, $(OCAML_VERSION)), 11)))
+ OCAMLDOC_OPT_EXISTS = $(CheckProg ocamldoc.opt)
+ OCAMLDOC = $(if $(OCAMLDOC_OPT_EXISTS), ocamldoc.opt, ocamldoc)
+
diff --git a/pa_do-0.8.13-fix-examples.patch b/pa_do-0.8.13-fix-examples.patch
new file mode 100644
index 0000000..dcabb43
--- /dev/null
+++ b/pa_do-0.8.13-fix-examples.patch
@@ -0,0 +1,47 @@
+diff -ur pa_do-0.8.13_OCaml3.12.old/examples/newton_basin_base.ml pa_do-0.8.13_OCaml3.12/examples/newton_basin_base.ml
+--- pa_do-0.8.13_OCaml3.12.old/examples/newton_basin_base.ml 2011-05-15 09:36:39.000000000 +0100
++++ pa_do-0.8.13_OCaml3.12/examples/newton_basin_base.ml 2012-07-03 16:10:56.146743651 +0100
+@@ -50,10 +50,10 @@
+ let i = convergence_graph (-2.) 2. (-2.) 2. in
+ open_graph " 600x600-50+20";
+ draw_image(make_image i) 0 0;
+- let rec wait () =
++ (*let rec wait () =
+ let s = wait_next_event [Key_pressed] in
+ if s.key <> 'q' then wait() in
+- (* wait(); *)
++ wait(); *)
+ close_graph()
+
+
+diff -ur pa_do-0.8.13_OCaml3.12.old/examples/newton_basin.ml pa_do-0.8.13_OCaml3.12/examples/newton_basin.ml
+--- pa_do-0.8.13_OCaml3.12.old/examples/newton_basin.ml 2011-05-15 09:36:39.000000000 +0100
++++ pa_do-0.8.13_OCaml3.12/examples/newton_basin.ml 2012-07-03 16:12:24.595415882 +0100
+@@ -39,11 +39,11 @@
+ let dx = (xmax -. xmin) /. float(xpixels - 1)
+ and dy = (ymax -. ymin) /. float(ypixels - 1) in
+ for j = 0 to ypixels - 1 do
+- for i = 0 to xpixels - 1 do
+- let z = Complex.(re(xmin +. dx *. float i) +im(ymin +. dy *. float j)) in
++ for i_ = 0 to xpixels - 1 do
++ let z = Complex.(re(xmin +. dx *. float i_) +im(ymin +. dy *. float j)) in
+ match root_color niters z with
+ | None -> ()
+- | Some c -> img.(j).(i) <- c
++ | Some c -> img.(j).(i_) <- c
+ done;
+ printf " %.0f%%\r%!" (100. *. float j /. float(ypixels - 1));
+ done;
+@@ -53,10 +53,10 @@
+ let i = convergence_graph (-2.) 2. (-2.) 2. in
+ open_graph " 600x600-50+20";
+ draw_image(make_image i) 0 0;
+- let rec wait () =
++ (*let rec wait () =
+ let s = wait_next_event [Key_pressed] in
+ if s.key <> 'q' then wait() in
+- (* wait(); *)
++ wait(); *)
+ close_graph()
+
+
diff --git a/pa_do-0.8.13-fix-toploop.patch b/pa_do-0.8.13-fix-toploop.patch
new file mode 100644
index 0000000..4c9a385
--- /dev/null
+++ b/pa_do-0.8.13-fix-toploop.patch
@@ -0,0 +1,12 @@
+diff -ur pa_do-0.8.13_OCaml3.12.old/src/OMakefile pa_do-0.8.13_OCaml3.12/src/OMakefile
+--- pa_do-0.8.13_OCaml3.12.old/src/OMakefile 2011-05-15 09:36:39.000000000 +0100
++++ pa_do-0.8.13_OCaml3.12/src/OMakefile 2012-07-03 16:09:15.383840367 +0100
+@@ -1,7 +1,7 @@
+ PP_SYNTAX = $(CAMLP4) -parser oq -parser op -parser pa_extend.cmo pr_dump.cmo
+ PP = $(PP_SYNTAX)
+ OCAMLDEPFLAGS += -pp "$(PP)"
+-OCAMLINCLUDES += +camlp4
++OCAMLINCLUDES += +camlp4 +compiler-libs
+ OCAMLPPFLAGS = -pp "$(PP)"
+ DOC_DIR = ../doc/html/
+ INSTALL_FILES = macro.mli pa_infix.mli delimited_overloading.mli std.mli \
diff --git a/sources b/sources
index 48d09a9..a1fcba9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd21b2352668e1a352832693c1e5858a pa_do-0.8.12_OCaml3.12.tar.gz
+50290c1754e6d4ee3c055544e2e4b1fc pa_do-0.8.13_OCaml3.12.tar.gz
More information about the scm-commits
mailing list