- noted currently working URL with camlp4 manuals

[packages/ocaml.git] / ocaml.spec

diff --git a/ocaml.spec b/ocaml.spec
index 4ea7b4c0bcf964a1dd3e785c4ccb28eac4444c49..815b461e546bcc62d0bc46899840e17cabeb6797 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -14,7 +14,7 @@ Summary:      The Objective Caml compiler and programming environment
 Summary(pl.UTF-8):     Kompilator OCamla (Objective Caml) oraz środowisko programistyczne
 Name:          ocaml
 Version:       3.12.1
-Release:       7
+Release:       21
 Epoch:         1
 License:       distributable
 Group:         Development/Languages
@@ -26,6 +26,7 @@ Source2:      http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.ps.
 # Source2-md5: a9c17db6ffd400c5ea00c6d51cbf56bf
 Source3:       http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz
 # Source3-md5: 8cf24c4f69c6f9c9f9cc1edb9b18f6cb
+# following 4 URLs are dead, some version now available at http://pauillac.inria.fr/camlp4/
 Source4:       ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.html.tar.gz
 # Source4-md5: 21370bae4e7f6435b38aeb21db7ce8bb
 Source5:       ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.dvi.gz
@@ -42,6 +43,7 @@ Patch0:               %{name}-db3.patch
 Patch1:                %{name}-CFLAGS.patch
 Patch2:                %{name}-as_needed.patch
 Patch3:                %{name}-gas.patch
+Patch4:                %{name}-tcl86.patch
 URL:           http://caml.inria.fr/
 BuildRequires: db-devel >= 4.1
 %{?with_tk:BuildRequires:      tk-devel}
@@ -320,6 +322,7 @@ cp %{SOURCE7} docs/camlp4-tutorial.ps.gz
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build 
 cp -f /usr/share/automake/config.sub config/gnu
@@ -333,8 +336,8 @@ cp -f /usr/share/automake/config.sub config/gnu
        -with-pthread \
        -x11lib %{_libdir}
 
-%{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall"
-%{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" -j1
+%{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall -DUSE_INTERP_RESULT"
+%{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall -DUSE_INTERP_RESULT" -j1
 
 # broken build system
 sed -e 's,LIBDIR,%{_libdir},' camlp4/man/camlp4.1.tpl > camlp4/man/camlp4.1