- modular xorg BRs, pass -fno-strict-aliasing, release 2.

Changed files:
    ocaml.spec -> 1.106

diff --git a/ocaml.spec b/ocaml.spec
index 2a961a34758728ac854a8fcfe4b7241765d7c347..3a17fc7b3779bca482e3842716850991bda06975 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -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.09.1
-Release:       1
+Release:       2
 Epoch:         1
 License:       distributable
 Vendor:                Group of implementors <caml-light@inria.fr>
@@ -48,7 +48,7 @@ Patch2:               %{name}-objinfo.patch
 Patch4:                %{name}-tk85support.patch
 Patch5:                %{name}-CFLAGS.patch
 URL:           http://caml.inria.fr/
-%{?with_x:BuildRequires:       XFree86-devel}
+%{?with_x:BuildRequires:       xorg-lib-libX11-devel}
 %{?with_db3:BuildRequires:     db3-devel}
 %{!?with_db3:BuildRequires:    db-devel >= 4.1}
 %{?with_tk:BuildRequires:      tk-devel}
@@ -63,6 +63,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.
@@ -339,7 +341,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