- added tk8.4 patch, now ready for tcl/tk 8.4.3

- simplified prep, made it clean-friendly

Changed files:
    ocaml-tk8.4.patch -> 1.1
    ocaml.spec -> 1.63

diff --git a/ocaml-tk8.4.patch b/ocaml-tk8.4.patch
new file mode 100644 (file)
index 0000000..9f27749
--- /dev/null
+++ b/ocaml-tk8.4.patch
@@ -0,0 +1,22 @@
+--- ocaml-3.06/otherlibs/labltk/support/cltkImg.c.orig 2002-07-23 16:11:59.000000000 +0200
++++ ocaml-3.06/otherlibs/labltk/support/cltkImg.c      2003-06-19 03:06:34.000000000 +0200
+@@ -99,7 +99,7 @@
+   pib.offset[0] = 0;
+   pib.offset[1] = 1;
+   pib.offset[2] = 2;
+-  Tk_PhotoPutBlock(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)); 
++  Tk_PhotoPutBlock_NoComposite(ph,&pib,Int_val(x),Int_val(y),Int_val(w),Int_val(h)); 
+ }
+ 
+ CAMLprim void camltk_setimgdata_bytecode(argv,argn)
+--- ocaml-3.06/otherlibs/labltk/tkanim/tkAnimGIF.c.orig        2002-07-23 16:12:00.000000000 +0200
++++ ocaml-3.06/otherlibs/labltk/tkanim/tkAnimGIF.c     2003-06-19 03:17:18.000000000 +0200
+@@ -335,7 +335,7 @@
+                 goto error;
+             }
+         }
+-        Tk_PhotoPutBlock(photoHandle, &block, 0, 0, 
++        Tk_PhotoPutBlock_NoComposite(photoHandle, &block, 0, 0, 
+                          imageWidth, imageHeight);
+ #ifdef TKANIM_DEBUG
+     fprintf(stderr, " Retrieving result\n");

diff --git a/ocaml.spec b/ocaml.spec
index 6b978f4615dd7add8a09e30f21d0761053b69452..0290d2af752cca2bb9c492bf4a19a354d79a57a6 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -39,20 +39,20 @@ Patch2:             %{name}-db3.patch
 Patch3:                %{name}-objinfo.patch
 Patch4:                %{name}-opt-symbols.patch
 Patch5:                %{name}-mano.patch
+Patch6:                %{name}-tk8.4.patch
 URL:           http://caml.inria.fr/
 Requires:      ocaml-runtime = %{version}-%{release}
 Obsoletes:     ocaml-ocamldoc
 Provides:      ocaml-ocamldoc
+%{!?_without_x11:BuildRequires:                XFree86-devel}
 %{?_with_db3:BuildRequires:    db3-devel}
 %{!?_with_db3:BuildRequires:   db-devel >= 4.1}
-%{!?_without_tk:BuildRequires:         tk-devel}
-%{!?_without_x11:BuildRequires:                XFree86-devel}
+%{!?_without_tk:BuildRequires:         tk-devel >= 8.4.3}
 %{!?_without_emacs:BuildRequires:      xemacs}
 %{!?_without_emacs:BuildRequires:      xemacs-common}
 %{!?_without_emacs:BuildRequires:      xemacs-fsf-compat-pkg}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 Objective Caml is a high-level, strongly-typed, functional and
 object-oriented programming language from the ML family of languages.
@@ -266,12 +266,10 @@ Pakiet ten zawiera 
 autorstwa Okasaki'ego, napisane w OCamlu, wraz z dodatkami.
 
 %prep
-%setup -q -T -b 0
-%setup -q -T -D -a 1
-%setup -q -T -D -c -n %{name}-%{version}/examples -a 7
-%setup -q -T -D -c -n %{name}-%{version}/examples -a 8
-%setup -q -T -D -n %{name}-%{version} -a 3
-%setup -q -T -D -n %{name}-%{version} -a 5
+%setup -q -a1 -a3 -a5
+mkdir examples
+tar xjf %{SOURCE7} -C examples
+tar xzf %{SOURCE8} -C examples
 # order mess with docs somewhat
 mkdir docs
 mkdir docs/html
@@ -287,6 +285,7 @@ cp %{SOURCE6} docs/camlp4-tutorial.ps.gz
 %patch3 -p1
 #%patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 ./configure \