- added as_needed.patch

[packages/ocaml.git] / ocaml.spec

diff --git a/ocaml.spec b/ocaml.spec
index 94f67cacf637c0c3ff84a76305dd0416f34b98dc..dc6c2fca33d3bd677fc6c8dc9dfaf9ac90db4311 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -14,14 +14,14 @@
 Summary:       The Objective Caml compiler and programming environment
 Summary(pl):   Kompilator OCamla (Objective Caml) oraz ¶rodowisko programistyczne
 Name:          ocaml
-Version:       3.09.0
-Release:       1
+Version:       3.09.2
+Release:       2
 Epoch:         1
 License:       distributable
 Vendor:                Group of implementors <caml-light@inria.fr>
 Group:         Development/Languages
-Source0:       http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.gz
-# Source0-md5: 5445b3fba28291fe789797d10cef3431
+Source0:       http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.bz2
+# Source0-md5: 63428ce7e114520e8f529c9ca809a1b0
 Source1:       http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.html.tar.gz
 # Source1-md5: b25eb211bf91bcaa536b12d12731ceec
 Source2:       http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.ps.gz
@@ -47,11 +47,12 @@ Patch2:             %{name}-objinfo.patch
 #Patch3:               %{name}-unused-var-warning.patch
 Patch4:                %{name}-tk85support.patch
 Patch5:                %{name}-CFLAGS.patch
+Patch6:                %{name}-as_needed.patch
 URL:           http://caml.inria.fr/
-%{?with_x:BuildRequires:       XFree86-devel}
 %{?with_db3:BuildRequires:     db3-devel}
 %{!?with_db3:BuildRequires:    db-devel >= 4.1}
 %{?with_tk:BuildRequires:      tk-devel}
+%{?with_x:BuildRequires:       xorg-lib-libX11-devel}
 %if %{with emacs}
 BuildRequires: sed >= 4.0
 BuildRequires: xemacs
@@ -63,6 +64,8 @@ Provides:     ocaml-ocamldoc
 Obsoletes:     ocaml-ocamldoc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                specflags       -fno-strict-aliasing
+
 %description
 Objective Caml is a high-level, strongly-typed, functional and
 object-oriented programming language from the ML family of languages.
@@ -328,6 +331,7 @@ cp %{SOURCE6} docs/camlp4-tutorial.ps.gz
 #%patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build 
 cp -f /usr/share/automake/config.sub config/gnu
@@ -339,7 +343,7 @@ cp -f /usr/share/automake/config.sub config/gnu
        -host %{_host} \
        %{!?with_tk:-no-tk} \
        -with-pthread \
-       -x11lib /usr/X11R6/%{_lib}
+       -x11lib %{_libdir}
 
 %{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall"
 %{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" -j1