rpms/ocaml-extlib/devel .cvsignore, 1.2, 1.3 extlib-install.patch, 1.1, 1.2 ocaml-extlib.spec, 1.3, 1.4 sources, 1.2, 1.3 extlib-ocamldoc-debian.patch, 1.1, NONE

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-extlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11185/devel

Modified Files:
	.cvsignore extlib-install.patch ocaml-extlib.spec sources 
Removed Files:
	extlib-ocamldoc-debian.patch 
Log Message:
* Tue Feb 12 2008 Richard W.M. Jones <rjones at redhat.com> - 1.5.1-1
- New upstream version 1.5.1.
- New home page.
- Rebuild for OCaml 3.10.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-extlib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Aug 2007 17:42:10 -0000	1.2
+++ .cvsignore	13 Feb 2008 00:16:43 -0000	1.3
@@ -1 +1 @@
-extlib-1.5.tar.gz
+extlib-1.5.1.tar.gz

extlib-install.patch:

Index: extlib-install.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-extlib/devel/extlib-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extlib-install.patch	1 Aug 2007 17:42:10 -0000	1.1
+++ extlib-install.patch	13 Feb 2008 00:16:43 -0000	1.2
@@ -1,25 +1,25 @@
---- install.ml.old	2007-05-19 14:11:48.000000000 +0100
-+++ install.ml	2007-05-19 14:17:27.000000000 +0100
+--- extlib-1.5.1.orig/install.ml	2008-02-12 18:01:34.000000000 +0000
++++ extlib-1.5.1/install.ml	2008-02-12 18:03:26.000000000 +0000
 @@ -64,10 +64,18 @@
- 		print_endline ("Installing " ^ file);
- 		let path = dest ^ file in
- 		(try Sys.remove path with _ -> ());
--		try
--			Sys.rename file path;
--		with
--			_ -> failwith "Aborted"
-+		let ichan = open_in file in
-+		let ochan = open_out path in
-+		let buf = String.create 1024 in
-+		let rec loop () =
-+			let len = input ichan buf 0 1024 in
-+			if len > 0 then (
-+				output ochan buf 0 len;
-+				loop ()
-+			)
-+		in
-+		loop ();
-+		Sys.remove file
- 	end
- 
- let complete_path p =
+ 		print_endline ("Installing " ^ file);
+ 		let path = dest ^ file in
+ 		(try Sys.remove path with _ -> ());
+-		try
+-			Sys.rename file path;
+-		with
+-			_ -> failwith "Aborted"
++		let ichan = open_in file in
++		let ochan = open_out path in
++		let buf = String.create 1024 in
++		let rec loop () =
++			let len = input ichan buf 0 1024 in
++			if len > 0 then (
++				output ochan buf 0 len;
++				loop ()
++			)
++		in
++		loop ();
++		Sys.remove file
+ 	end
+ 
+ let complete_path p =


Index: ocaml-extlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-extlib/devel/ocaml-extlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-extlib.spec	6 Sep 2007 15:39:20 -0000	1.3
+++ ocaml-extlib.spec	13 Feb 2008 00:16:43 -0000	1.4
@@ -2,21 +2,20 @@
 %define debug_package %{nil}
 
 Name:           ocaml-extlib
-Version:        1.5
-Release:        8%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        OCaml ExtLib additions to the standard library
 
 Group:          Development/Libraries
 License:        LGPL
-URL:            http://ocaml-lib.sourceforge.net/
-Source0:        extlib-1.5.tar.gz
+URL:            http://code.google.com/p/ocaml-extlib/
+Source0:        http://ocaml-extlib.googlecode.com/files/extlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64
 
-Patch0:         extlib-ocamldoc-debian.patch
-Patch1:         extlib-install.patch
+Patch0:         extlib-install.patch
 
-BuildRequires:  ocaml >= 3.10.0-7
+BuildRequires:  ocaml >= 3.10.1
 BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
@@ -47,8 +46,6 @@
 
 %prep
 %setup -q -n extlib-%{version}
-%patch0 -p1
-%patch1
 
 # Files in the archive have spurious +x mode.
 chmod 0644 *
@@ -58,6 +55,8 @@
   %{__sed} -i 's/\r//' $f;
 done
 
+%patch0 -p1
+
 
 %build
 # You can't just build extlib!
@@ -114,6 +113,11 @@
 %{_libdir}/ocaml/extlib/*.ml
 
 %changelog
+* Tue Feb 12 2008 Richard W.M. Jones <rjones at redhat.com> - 1.5.1-1
+- New upstream version 1.5.1.
+- New home page.
+- Rebuild for OCaml 3.10.1.
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 1.5-8
 - Force rebuild because of updated requires/provides scripts in OCaml.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-extlib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Aug 2007 17:42:10 -0000	1.2
+++ sources	13 Feb 2008 00:16:43 -0000	1.3
@@ -1 +1 @@
-17808ae18d6b6e40637f0df8561583e8  extlib-1.5.tar.gz
+8dc2944cbf63141347956bd353893d75  extlib-1.5.1.tar.gz


--- extlib-ocamldoc-debian.patch DELETED ---