From eae7bd732db67fc2021ff07d97db747324e639b8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 5 Jan 2011 14:28:50 +0000 Subject: [PATCH] - New upstream version 0.9.8.6-0.rc1. --- .gitignore | 1 + ocaml-omake-0.9.8.5-free-buffer.patch | 33 -------------------- ocaml-omake-0.9.8.5-no-sync.patch | 11 ------- ocaml-omake-debian-stdin-stdout-fix.patch | 26 --------------- ocaml-omake.spec | 22 +++++++------ omake-debian-disable-ocaml312-warnings.patch | 13 ++++++++ sources | 2 +- 7 files changed, 27 insertions(+), 81 deletions(-) delete mode 100644 ocaml-omake-0.9.8.5-free-buffer.patch delete mode 100644 ocaml-omake-0.9.8.5-no-sync.patch delete mode 100755 ocaml-omake-debian-stdin-stdout-fix.patch create mode 100644 omake-debian-disable-ocaml312-warnings.patch diff --git a/.gitignore b/.gitignore index 99e2aed..ab69f2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ omake-0.9.8.5-3.tar.gz +/omake-0.9.8.6-0.rc1.tar.gz diff --git a/ocaml-omake-0.9.8.5-free-buffer.patch b/ocaml-omake-0.9.8.5-free-buffer.patch deleted file mode 100644 index de17ff8..0000000 --- a/ocaml-omake-0.9.8.5-free-buffer.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur omake-0.9.8.5.orig/src/libmojave-external/cutil/lm_printf.c omake-0.9.8.5/src/libmojave-external/cutil/lm_printf.c ---- omake-0.9.8.5.orig/src/libmojave-external/cutil/lm_printf.c 2007-07-15 18:55:23.000000000 +0100 -+++ omake-0.9.8.5/src/libmojave-external/cutil/lm_printf.c 2009-02-06 11:13:42.000000000 +0000 -@@ -142,12 +142,12 @@ - #endif - if(code < 0) { - if(bufp != buffer) -- free(buffer); -+ free(bufp); - failwith("ml_print_string"); - } - v_result = copy_string(bufp); - if(bufp != buffer) -- free(buffer); -+ free(bufp); - return v_result; - } - -@@ -190,12 +190,12 @@ - #endif - if(code < 0) { - if(bufp != buffer) -- free(buffer); -+ free(bufp); - failwith("ml_print_string"); - } - v_result = copy_string(bufp); - if(bufp != buffer) -- free(buffer); -+ free(bufp); - return v_result; - } - diff --git a/ocaml-omake-0.9.8.5-no-sync.patch b/ocaml-omake-0.9.8.5-no-sync.patch deleted file mode 100644 index 528912e..0000000 --- a/ocaml-omake-0.9.8.5-no-sync.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- omake-0.9.8.5.orig/src/exec/omake_exec.ml 2006-12-08 22:52:01.000000000 +0000 -+++ omake-0.9.8.5.newcaml/src/exec/omake_exec.ml 2008-12-05 20:12:17.000000000 +0000 -@@ -46,8 +46,6 @@ - open Omake_options - open Omake_command_type - --external sync : unit -> unit = "caml_sync" -- - module Exec = - struct - (* diff --git a/ocaml-omake-debian-stdin-stdout-fix.patch b/ocaml-omake-debian-stdin-stdout-fix.patch deleted file mode 100755 index e2499e7..0000000 --- a/ocaml-omake-debian-stdin-stdout-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_stdin_stdout_fix.dpatch by Mike Furr -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: stdin <-> stdout fix (upstream r12115) - -@DPATCH@ -diff -urNad omake-0.9.8.5~/src/build/omake_rule.ml omake-0.9.8.5/src/build/omake_rule.ml ---- omake-0.9.8.5~/src/build/omake_rule.ml 2007-07-02 14:20:23.000000000 -0400 -+++ omake-0.9.8.5/src/build/omake_rule.ml 2007-09-06 12:52:23.752616976 -0400 -@@ -1040,12 +1040,12 @@ - * Evaluate the commands NOW. - *) - and exec_commands venv pos loc commands = -- let stdin = channel_of_var venv pos loc stdin_var in - let stdout = channel_of_var venv pos loc stdout_var in -- let stdin = Lm_channel.descr stdin in -+ let stderr = channel_of_var venv pos loc stderr_var in - let stdout = Lm_channel.descr stdout in -+ let stderr = Lm_channel.descr stderr in - List.iter (fun command -> -- let pid = eval_shell_internal stdin stdout command in -+ let pid = eval_shell_internal stdout stderr command in - let status, _ = eval_shell_wait venv pos pid in - let code = - match status with diff --git a/ocaml-omake.spec b/ocaml-omake.spec index 794e472..148bf5b 100644 --- a/ocaml-omake.spec +++ b/ocaml-omake.spec @@ -1,20 +1,18 @@ %define debug_package %{nil} Name: ocaml-omake -Version: 0.9.8.5 -Release: 12%{?dist} +Version: 0.9.8.6 +Release: 0.rc1%{?dist} Summary: Build system with automated dependency analysis Group: Development/Tools License: LGPLv2+ with exceptions and GPLv2+ and BSD URL: http://omake.metaprl.org/download.html -Source0: http://omake.metaprl.org/downloads/omake-%{version}-3.tar.gz +Source0: http://omake.metaprl.org/downloads/omake-%{version}-0.rc1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x -Patch0: ocaml-omake-debian-stdin-stdout-fix.patch -Patch1: ocaml-omake-0.9.8.5-no-sync.patch -Patch2: ocaml-omake-0.9.8.5-free-buffer.patch +Patch0: omake-debian-disable-ocaml312-warnings.patch # omake can be used on non-OCaml projects (RHBZ#548536). Provides: omake @@ -50,9 +48,8 @@ features many additional enhancements, including the following. %prep %setup -q -n omake-%{version} + %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build @@ -77,17 +74,22 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc LICENSE LICENSE.OMake ocamldep/LICENSE.ocamldep-omake +%doc LICENSE LICENSE.OMake %doc CHANGELOG.txt %doc doc/txt/omake-doc.txt doc/ps/omake-doc.pdf doc/html/ %{_libdir}/omake/ -%{_bindir}/ocamldep-omake %{_bindir}/omake %{_bindir}/osh %{_bindir}/cvs_realclean %changelog +* Wed Jan 5 2011 Richard W.M. Jones - 0.9.8.6-0.rc1 +- New upstream version 0.9.8.6-0.rc1. +- Remove patches - all are upstream. +- Add patch to disable new warning in OCaml 3.12 (by Stephane Glondu). +- No separate omake-ocamldep program. + * Tue Jan 5 2010 Richard W.M. Jones - 0.9.8.5-12 - Use upstream RPM 4.8 OCaml dependency generator. diff --git a/omake-debian-disable-ocaml312-warnings.patch b/omake-debian-disable-ocaml312-warnings.patch new file mode 100644 index 0000000..dc8ef17 --- /dev/null +++ b/omake-debian-disable-ocaml312-warnings.patch @@ -0,0 +1,13 @@ +Patch by Stephane Glondu. + +--- omake-0.9.8.6.old/OMakefile 2010-10-27 01:42:37.000000000 +0100 ++++ omake-0.9.8.6/OMakefile 2011-01-05 14:33:42.170895298 +0000 +@@ -57,7 +57,7 @@ + # + # OCaml options + # +-OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z) ++OCAMLFLAGS[] += -w Aer-29$(if $(OCAML_ACCEPTS_Z_WARNING), z) + if $(THREADS_ENABLED) + OCAMLFLAGS += -thread + export diff --git a/sources b/sources index fb1bf3b..2832651 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d114b3c4201808aacd73ec1a98965c47 omake-0.9.8.5-3.tar.gz +fe39a476ef4e33b7ba2ca77a6bcaded2 omake-0.9.8.6-0.rc1.tar.gz