rpms/ocaml/devel ocaml.spec,1.40,1.41

[Richard W.M. Jones (rjones)]

Author: rjones

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

Modified Files:
	ocaml.spec 
Log Message:
* Wed Jun  4 2008 Richard W.M. Jones <rjones at redhat.com> - 3.10.2-3
- ocaml-ocamldoc provides ocamldoc (bz #449931).
- REMOVED provides of labltk, camlp4.  Those are libraries and all
  packages should now depend on ocaml-labltk / ocaml-camlp4 / -devel
  as appropriate.



Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ocaml.spec	8 May 2008 11:18:50 -0000	1.40
+++ ocaml.spec	4 Jun 2008 10:57:55 -0000	1.41
@@ -1,6 +1,6 @@
 Name:           ocaml
 Version:        3.10.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -96,8 +96,6 @@
 Group:          System Environment/Libraries
 Summary:        Tk bindings for Objective Caml
 Requires:       ocaml-runtime = %{version}-%{release}
-Provides:       labltk = %{version}-%{release}
-Obsoletes:      labltk < %{version}-%{release}
 
 %description labltk
 Labltk is a library for interfacing Objective Caml with the scripting
@@ -112,8 +110,6 @@
 Requires:       ocaml = %{version}-%{release}
 Requires:       %{name}-labltk = %{version}-%{release}
 Requires:       libX11-devel
-Provides:       labltk = %{version}-%{release}
-Obsoletes:      labltk < %{version}-%{release}
 
 %description labltk-devel
 Labltk is a library for interfacing Objective Caml with the scripting
@@ -127,8 +123,6 @@
 Group:          Development/Languages
 Summary:        Pre-Processor-Pretty-Printer for Objective Caml
 Requires:       ocaml-runtime = %{version}-%{release}
-Provides:       camlp4 = %{version}-%{release}
-Obsoletes:      camlp4 < %{version}-%{release}
 
 %description camlp4
 Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a
@@ -142,8 +136,6 @@
 Summary:        Pre-Processor-Pretty-Printer for Objective Caml
 Requires:       ocaml = %{version}-%{release}
 Requires:       %{name}-camlp4 = %{version}-%{release}
-Provides:       camlp4 = %{version}-%{release}
-Obsoletes:      camlp4 < %{version}-%{release}
 
 %description camlp4-devel
 Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a
@@ -156,6 +148,7 @@
 Group:          Development/Languages
 Summary:        Documentation generator for Objective Caml.
 Requires:       ocaml = %{version}-%{release}
+Provides:	ocamldoc
 
 %description ocamldoc
 Documentation generator for Objective Caml.
@@ -434,6 +427,12 @@
 
 
 %changelog
+* Wed Jun  4 2008 Richard W.M. Jones <rjones at redhat.com> - 3.10.2-3
+- ocaml-ocamldoc provides ocamldoc (bz #449931).
+- REMOVED provides of labltk, camlp4.  Those are libraries and all
+  packages should now depend on ocaml-labltk / ocaml-camlp4 / -devel
+  as appropriate.
+
 * Thu May  8 2008 Richard W.M. Jones <rjones at redhat.com> - 3.10.2-2
 - Pass MAP_32BIT to mmap (bz #445545).