- added 10266 patch (https://github.com/ocaml/ocaml/pull/10266) to fix build with...

[packages/ocaml.git] / ocaml.spec

diff --git a/ocaml.spec b/ocaml.spec
index 2af1d48dbf50fd65e0e107f545097d0c70a9383f..f6b886578079a2495837a2a114ebfada5827515e 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:       4.12.0
-Release:       4
+Release:       5
 Epoch:         1
 License:       QPL v1.0 with linking exception (compiler), LGPL v2 with linking exception (library)
 Group:         Development/Languages
@@ -29,16 +29,17 @@ Source4:    https://github.com/mmottl/pure-fun/archive/v1.0.13/pure-fun-1.0.13.tar.
 # note: dead URL
 Source5:       http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz
 # Source5-md5: 77fa1da7375dea1393cc0b6cd802d7e1
+Patch0:                %{name}-10266.patch
 URL:           https://www.ocaml.org/
 Requires:      %{name}-runtime = %{epoch}:%{version}-%{release}
 Provides:      ocaml-bytes-devel
 Provides:      ocaml-ocamldoc
 Obsoletes:     ocaml-bytes-devel
-Obsoletes:     ocaml-doc-ps < 4.12
-Obsoletes:     ocaml-emacs < 4.12
+Obsoletes:     ocaml-doc-ps < 1:4.12
+Obsoletes:     ocaml-emacs < 1:4.12
 Obsoletes:     ocaml-ocamldoc
-Obsoletes:     ocaml-x11graphics < 4.12
-Obsoletes:     ocaml-x11graphics-devel < 4.12
+Obsoletes:     ocaml-x11graphics < 1:4.12
+Obsoletes:     ocaml-x11graphics-devel < 1:4.12
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags       -fno-strict-aliasing
@@ -164,12 +165,14 @@ Okasaki'ego, napisane w OCamlu, wraz z dodatkami.
 
 %prep
 %setup -q -a1 -a3
+%patch0 -p1
+
 mkdir examples
 tar xzf %{SOURCE4} -C examples
 tar xzf %{SOURCE5} -C examples
 # order mess with docs somewhat
 mkdir -p docs/html
-mv htmlman docs/html/ocaml
+%{__mv} htmlman docs/html/ocaml
 
 %build
 %configure \
@@ -216,7 +219,7 @@ ln -sf %{_libdir}/%{name}/{scrape,add}labels $RPM_BUILD_ROOT%{_bindir}
 %{__rm} -r $RPM_BUILD_ROOT%{_mandir}/man3
 
 # install info pages
-cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir}
+cp -p infoman/ocaml.info{,.body-*}.gz $RPM_BUILD_ROOT%{_infodir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT