diff --git a/ocaml.changes b/ocaml.changes index 97b2b71..17d918b 100644 --- a/ocaml.changes +++ b/ocaml.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 30 06:11:26 UTC 2016 - ohering@suse.de + +- Correct .TH macro creation in ocamldoc (ocaml#7281) + ocamldoc-man-th.patch + ------------------------------------------------------------------- Thu Jun 16 14:26:17 UTC 2016 - ohering@suse.de diff --git a/ocaml.spec b/ocaml.spec index c9983e4..eeb530c 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -60,6 +60,7 @@ Source3: ocaml-%{doc_version}-refman.info.tar.xz Source4: rpmlintrc Source99: update_ocaml_deps.sh Patch0: ocaml-3.00-camldebug_el.patch +Patch1: ocamldoc-man-th.patch Patch2: ocaml-3.04-ocamltags--no-site-start.patch # FIX-UPSTREAM pass RPM_OPT_FLAGS to build Patch4: ocaml-configure-Allow-user-defined-C-compiler-flags.patch @@ -232,6 +233,7 @@ developing applications that use %{name}. : do_opt %{do_opt} %setup -q -a 2 -a 3 %patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch4 -p1 %patch5 diff --git a/ocamldoc-man-th.patch b/ocamldoc-man-th.patch new file mode 100644 index 0000000..2e7be8b --- /dev/null +++ b/ocamldoc-man-th.patch @@ -0,0 +1,52 @@ +http://caml.inria.fr/mantis/view.php?id=7281 +--- + ocamldoc/odoc_man.ml | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/ocamldoc/odoc_man.ml ++++ b/ocamldoc/odoc_man.ml +@@ -871,7 +871,7 @@ class man = + let b = new_buf () in + bs b (".TH \""^cl.cl_name^"\" "); + bs b !man_section ; +- bs b (" source: "^Odoc_misc.current_date^" "); ++ bs b (" "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + +@@ -929,7 +929,7 @@ class man = + let b = new_buf () in + bs b (".TH \""^ct.clt_name^"\" "); + bs b !man_section ; +- bs b (" source: "^Odoc_misc.current_date^" "); ++ bs b (" "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + +@@ -1021,7 +1021,7 @@ class man = + let b = new_buf () in + bs b (".TH \""^mt.mt_name^"\" "); + bs b !man_section ; +- bs b (" source: "^Odoc_misc.current_date^" "); ++ bs b (" "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + +@@ -1103,7 +1103,7 @@ class man = + let b = new_buf () in + bs b (".TH \""^m.m_name^"\" "); + bs b !man_section ; +- bs b (" source: "^Odoc_misc.current_date^" "); ++ bs b (" "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + +@@ -1209,7 +1209,7 @@ class man = + let b = new_buf () in + bs b (".TH \""^name^"\" "); + bs b !man_section ; +- bs b (" source: "^Odoc_misc.current_date^" "); ++ bs b (" "^Odoc_misc.current_date^" "); + bs b "OCamldoc "; + bs b ("\""^(match !Global.title with Some t -> t | None -> "")^"\"\n"); + bs b ".SH NAME\n";