rpms/ocaml-omake
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New upstream version 0.10.3.

Browse Source 
New upstream website (camlcity.org) and maintainer.
Modernize the spec file.
Remove old patches which no longer apply.
Reenable hevea dependency.
Remove "cvs_realclean".
This commit is contained in:
Richard W.M. Jones 2017-11-07 19:19:18 +00:00
parent 74592245b6
commit 1b75110603
6 changed files with 21 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
omake-0.9.8.5-3.tar.gz
/omake-0.9.8.6-0.rc1.tar.gz
/omake-0.10.3.tar.gz

47
ocaml-omake.spec
View File

@ -1,21 +1,11 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
%if !%opt
%global debug_package %{nil}
%global __strip /bin/true
%endif
Name: ocaml-omake
Version: 0.9.8.6
Release: 0.rc1%{?dist}.29
Version: 0.10.3
Release: 1
Summary: Build system with automated dependency analysis
License: LGPLv2+ with exceptions and GPLv2+ and BSD
URL: http://omake.metaprl.org/download.html
Source0: http://omake.metaprl.org/downloads/omake-%{version}-0.rc1.tar.gz
Patch0: omake-debian-disable-ocaml-warnings.patch
Patch1: omake-0.9.8.6-fix-and-or-operators.patch
Patch2: omake-0.9.8.6-kill-warn-error.patch
URL: http://projects.camlcity.org/projects/omake.html
Source0: http://download.camlcity.org/download/omake-%{version}.tar.gz
# omake can be used on non-OCaml projects (RHBZ#548536).
Provides: omake
@ -25,7 +15,7 @@ BuildRequires: ocaml-findlib-devel
BuildRequires: gamin-devel
BuildRequires: readline-devel
BuildRequires: ncurses-devel
#BuildRequires: hevea
BuildRequires: hevea
BuildRequires: chrpath
@ -52,35 +42,36 @@ features many additional enhancements, including the following.
%prep
%setup -q -n omake-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
make all \
PREFIX=%{_prefix} MANDIR=%{_mandir} BINDIR=%{_bindir} LIBDIR=%{_libdir}
echo 'LIBDIR=%{_libdir}' > .config.local
./configure -prefix %{_prefix}
make all
%install
make install \
INSTALL_ROOT=$RPM_BUILD_ROOT \
PREFIX=%{_prefix} MANDIR=%{_mandir} BINDIR=%{_bindir} LIBDIR=%{_libdir}
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/*
INSTALL_ROOT=$RPM_BUILD_ROOT
%files
%doc LICENSE LICENSE.OMake
%doc CHANGELOG.txt
%doc CONTRIBUTORS.org LICENSE LICENSE.OMake README.md
%doc ChangeLog
%doc doc/txt/omake-doc.txt doc/ps/omake-doc.pdf doc/html/
%{_libdir}/omake/
%{_bindir}/omake
%{_bindir}/osh
%{_bindir}/cvs_realclean
%changelog
* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-1
- New upstream version 0.10.3.
- New upstream website (camlcity.org) and maintainer.
- Modernize the spec file.
- Remove old patches which no longer apply.
- Reenable hevea dependency.
- Remove "cvs_realclean".
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.29
- OCaml 4.05.0 rebuild.

129
omake-0.9.8.6-fix-and-or-operators.patch
View File

@ -1,129 +0,0 @@
diff -ur omake-0.9.8.6.old/src/libmojave-external/stdlib/lm_array_util.ml omake-0.9.8.6/src/libmojave-external/stdlib/lm_array_util.ml
--- omake-0.9.8.6.old/src/libmojave-external/stdlib/lm_array_util.ml 2006-07-15 18:23:37.000000000 +0100
+++ omake-0.9.8.6/src/libmojave-external/stdlib/lm_array_util.ml 2013-09-19 13:12:58.851096621 +0100
@@ -85,7 +85,7 @@
let mem i v =
let l = Array.length v in
let rec aux j =
- j < l & ( i = v.(j) or
+ j < l && ( i = v.(j) ||
aux (j + 1) )
in
aux 0
@@ -112,7 +112,7 @@
let exists f v =
let l = Array.length v in
let rec aux j =
- j < l & ( f v.(j) or
+ j < l && ( f v.(j) ||
aux (j + 1) )
in
aux 0
diff -ur omake-0.9.8.6.old/src/libmojave-external/util/lm_filename_util.ml omake-0.9.8.6/src/libmojave-external/util/lm_filename_util.ml
--- omake-0.9.8.6.old/src/libmojave-external/util/lm_filename_util.ml 2007-01-29 20:14:42.000000000 +0000
+++ omake-0.9.8.6/src/libmojave-external/util/lm_filename_util.ml 2013-09-19 13:14:00.082153118 +0100
@@ -412,7 +412,7 @@
let simplify_path path =
let rec simplify path' = function
dir::tl ->
- if dir = "" or dir = "." then
+ if dir = "" || dir = "." then
simplify path' tl
else if dir = ".." then
match path' with
diff -ur omake-0.9.8.6.old/src/libmojave-external/stdlib/lm_list_util.ml omake-0.9.8.6/src/libmojave-external/stdlib/lm_list_util.ml
--- omake-0.9.8.6.old/src/libmojave-external/stdlib/lm_list_util.ml 2007-05-14 04:12:14.000000000 +0100
+++ omake-0.9.8.6/src/libmojave-external/stdlib/lm_list_util.ml 2013-09-19 13:12:26.120066393 +0100
@@ -576,7 +576,7 @@
let rec intersects l = function
h :: t ->
- List.mem h l or intersects l t
+ List.mem h l || intersects l t
| [] ->
false
@@ -763,7 +763,7 @@
let rec compare_eq l1 l2 =
match l1, l2 with
h1::t1, h2::t2 ->
- h1 == h2 & compare_eq t1 t2
+ h1 == h2 && compare_eq t1 t2
| [], [] ->
true
| _ ->
@@ -813,7 +813,7 @@
*)
let rec for_all2 f l1 l2 =
match (l1,l2) with
- h1::t1, h2::t2 -> f h1 h2 & for_all2 f t1 t2
+ h1::t1, h2::t2 -> f h1 h2 && for_all2 f t1 t2
| [], [] -> true
| _ -> false
@@ -822,7 +822,7 @@
*)
let rec exists2 f l1 l2 = match (l1,l2) with
h1::t1, h2::t2 ->
- f h1 h2 or exists2 f t1 t2
+ f h1 h2 || exists2 f t1 t2
| _ -> false
(*
diff -ur omake-0.9.8.6.old/src/libmojave-external/stdlib/lm_string_util.ml omake-0.9.8.6/src/libmojave-external/stdlib/lm_string_util.ml
--- omake-0.9.8.6.old/src/libmojave-external/stdlib/lm_string_util.ml 2008-06-28 02:21:34.000000000 +0100
+++ omake-0.9.8.6/src/libmojave-external/stdlib/lm_string_util.ml 2013-09-19 13:13:38.745133434 +0100
@@ -97,7 +97,7 @@
let for_all f s =
let len = String.length s in
let rec check i =
- (i = len) or (f s.[i] & check (succ i))
+ (i = len) || (f s.[i] && check (succ i))
in
check 0
@@ -1239,7 +1239,7 @@
let sub name s i len =
if !debug_string then
let len' = String.length s in
- if i >= 0 & len >= 0 & i + len < len' then
+ if i >= 0 && len >= 0 && i + len < len' then
String.sub s i len
else
begin
@@ -1253,7 +1253,7 @@
if !debug_string then
let from_len = String.length froms in
let to_len = String.length tos in
- if i >= 0 & j >= 0 & len >= 0 & i + len < from_len & j + len < to_len then
+ if i >= 0 && j >= 0 && len >= 0 && i + len < from_len && j + len < to_len then
String.blit froms i tos j len
else
begin
@@ -1266,7 +1266,7 @@
let set name s i c =
if !debug_string then
let len = String.length s in
- if i >= 0 & i < len then
+ if i >= 0 && i < len then
String.set s i c
else
begin
@@ -1278,7 +1278,7 @@
let get name s i =
let len = String.length s in
- if i >= 0 & i < len then
+ if i >= 0 && i < len then
String.get s i
else
begin
@@ -1534,7 +1534,7 @@
buf.[i] <- ' ';
convert (i + 1) (j + 1)
end
- else if uri.[j] = '%' & j < len - 2 then
+ else if uri.[j] = '%' && j < len - 2 then
begin
buf.[i] <- unhex_char uri.[j + 1] uri.[j + 2];
convert (i + 1) (j + 3)

11
omake-0.9.8.6-kill-warn-error.patch
View File

@ -1,11 +0,0 @@
--- omake-0.9.8.6.old/lib/build/OCaml.om 2008-03-05 01:07:25.000000000 +0000
+++ omake-0.9.8.6/lib/build/OCaml.om 2014-08-18 10:01:19.433742023 +0100
@@ -176,7 +176,7 @@
#
declare OCAMLDEPFLAGS
public.OCAMLPPFLAGS =
-public.OCAMLFLAGS = -warn-error A
+public.OCAMLFLAGS =
public.OCAMLCFLAGS = -g
public.OCAMLOPTFLAGS =
public.OCAMLCPPFLAGS =

15
omake-debian-disable-ocaml-warnings.patch
View File

@ -1,15 +0,0 @@
Patch by Stephane Glondu.
Modified by RWMJ to remove all warnings.
--- 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[] +=
if $(THREADS_ENABLED)
OCAMLFLAGS += -thread
export

2
sources
View File

@ -1 +1 @@
fe39a476ef4e33b7ba2ca77a6bcaded2 omake-0.9.8.6-0.rc1.tar.gz
SHA512 (omake-0.10.3.tar.gz) = 77eb87b819048d7d9cb9b89a73c5f922ba3adc93f0d58536b3cfa20abdbf1d2a4c576b77921c52e8ea5f80171e8a503b573bf2a92b65fa0579f6492574079733