- rel 4 to rebuild with new db

[packages/ocaml.git] / ocaml.spec

diff --git a/ocaml.spec b/ocaml.spec
index d3653b84bad9fde8e48251f7f17b80562f10d939..960cc73870554724c641f2cc88d0232e00da4fe4 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -2,12 +2,12 @@
 # Conditional build:
 
 %bcond_without emacs   # emacs subpackage
-%bcond_without x11     # without X11 support 
+%bcond_without x       # without X11 support 
 %bcond_without tk      # tk support
 %bcond_with db3                # use db3 instead of db 4.x
 
 # --without x11 implies --without tk
-%{!?with_x11:%undefine with_tk}
+%{!?with_x:%undefine   with_tk}
 
 %define p4ver 3.06
 
@@ -15,7 +15,7 @@ Summary:      The Objective Caml compiler and programming environment
 Summary(pl):   Kompilator OCamla (Objective Caml) oraz ¶rodowisko programistyczne
 Name:          ocaml
 Version:       3.07
-Release:       1
+Release:       4
 License:       distributable
 Vendor:                Group of implementors <caml-light@inria.fr>
 Group:         Development/Languages
@@ -42,8 +42,10 @@ Patch1:              %{name}-db3.patch
 Patch2:                %{name}-objinfo.patch
 Patch3:                %{name}-mano.patch
 Patch4:                %{name}-unused-var-warning.patch
+Patch5:                %{name}-3.07-patch2.diffs
+Patch6:                %{name}-emacs_batch_mode.patch
 URL:           http://caml.inria.fr/
-%{?with_x11:BuildRequires:             XFree86-devel}
+%{?with_x:BuildRequires:               XFree86-devel}
 %{?with_db3:BuildRequires:     db3-devel}
 %{!?with_db3:BuildRequires:    db-devel >= 4.1}
 %{?with_tk:BuildRequires:              tk-devel}
@@ -51,6 +53,7 @@ URL:          http://caml.inria.fr/
 BuildRequires: xemacs
 BuildRequires: xemacs-common
 BuildRequires: xemacs-fsf-compat-pkg
+
 %endif
 Requires:      ocaml-runtime = %{version}-%{release}
 Provides:      ocaml-ocamldoc
@@ -288,6 +291,8 @@ cp %{SOURCE6} docs/camlp4-tutorial.ps.gz
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 ./configure \