commit eae7bd732db67fc2021ff07d97db747324e639b8
Author: Richard W.M. Jones <rjones@xxxxxxxxxx>
Date: Wed Jan 5 14:28:50 2011 +0000
- 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(-)
---
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.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 <rjones@xxxxxxxxxx> - 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 <rjones@xxxxxxxxxx> - 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
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
