rpms/ocaml-cmigrep/devel .cvsignore, 1.3, 1.4 ocaml-cmigrep.spec, 1.7, 1.8 sources, 1.3, 1.4

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-cmigrep/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18678

Modified Files:
	.cvsignore ocaml-cmigrep.spec sources 
Log Message:
Rebuild for OCaml 3.11.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	20 Nov 2008 17:25:46 -0000	1.3
+++ .cvsignore	4 Dec 2008 19:10:34 -0000	1.4
@@ -1,2 +1,3 @@
 cmigrep-1.5.tar.bz2
 ocaml-3.11.0+beta1.tar.bz2
+ocaml-3.11.0.tar.bz2


Index: ocaml-cmigrep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/ocaml-cmigrep.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ocaml-cmigrep.spec	24 Nov 2008 10:57:30 -0000	1.7
+++ ocaml-cmigrep.spec	4 Dec 2008 19:10:34 -0000	1.8
@@ -3,27 +3,25 @@
 
 %define ocaml_major 3.11
 %define ocaml_minor 0
-%define ocaml_extra +beta1
 
 %define _default_patch_fuzz 2
 
 Name:           ocaml-cmigrep
 Version:        1.5
-Release:        7%{?dist}
+Release:        9%{?dist}
 Summary:        Search OCaml compiled interface (cmi) files
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://homepage.mac.com/letaris/
 Source0:        http://homepage.mac.com/letaris/cmigrep-%{version}.tar.bz2
-Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}%{ocaml_extra}.tar.bz2
+Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         cmigrep-make-without-godi-debian.patch
 Patch1:         ocaml-3.11.0-rpath.patch
 Patch2:         ocaml-user-cflags.patch
 Patch3:         ocaml-3.11.0-ppc64.patch
-Patch6:         ocaml-3.11.0-string-index-from.patch
 
 # Sent upstream on 2008-11-20.
 Patch10:        ocaml-cmigrep-3.11.0-updated-types.patch
@@ -53,13 +51,12 @@
 # however in Debian the only packages which actually use
 # compiler-libs are camlp5 & cmigrep.
 bzcat %{SOURCE1} | tar xf -
-pushd ocaml-%{ocaml_major}.%{ocaml_minor}%{ocaml_extra}
+pushd ocaml-%{ocaml_major}.%{ocaml_minor}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch6 -p1
 popd
-mv ocaml-%{ocaml_major}.%{ocaml_minor}%{ocaml_extra} compiler
+mv ocaml-%{ocaml_major}.%{ocaml_minor} compiler
 
 %patch10 -p1
 
@@ -105,6 +102,13 @@
 
 
 %changelog
+* Thu Dec  4 2008 Richard W.M. Jones <rjones at redhat.com> - 1.5-9
+- Rebuild for OCaml 3.11.0.
+
+* Wed Nov 26 2008 Richard W.M. Jones <rjones at redhat.com> - 1.5-8
+- Rebuild for OCaml 3.11.0+rc1.
+- Remove string-index-from patch.
+
 * Thu Nov 20 2008 Richard W.M. Jones <rjones at redhat.com> - 1.5-7
 - Apply string-index-from patch from OCaml package.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-cmigrep/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Nov 2008 17:25:46 -0000	1.3
+++ sources	4 Dec 2008 19:10:34 -0000	1.4
@@ -1,2 +1,2 @@
 869ba6758a773c4218461f14f6ebcb4e  cmigrep-1.5.tar.bz2
-77cc67933e451354b6d1ef0ace4f5dc5  ocaml-3.11.0+beta1.tar.bz2
+6ed1c3ed660a15408362242fa8fa4668  ocaml-3.11.0.tar.bz2