X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml-zarith.git;a=blobdiff_plain;f=ocaml-zarith.spec;h=b5f7c3580d79047e949e00bcb1a180d8055e202d;hp=bf7d764d8e8c9b959162ace51e8f0aab133d8974;hb=a40b17b;hpb=41878b55efe78206165dd4a918c0ae144b48fa44

diff --git a/ocaml-zarith.spec b/ocaml-zarith.spec
index bf7d764..b5f7c35 100644
--- a/ocaml-zarith.spec
+++ b/ocaml-zarith.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
+%bcond_without	ocaml_opt	# native optimized binaries (bytecode is always built)
 
 # not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
 %ifnarch %{ix86} %{x8664} %{arm} aarch64 ppc sparc sparcv9
@@ -11,21 +11,22 @@
 Summary:	Zarith: arbitrary-precision integers
 Summary(pl.UTF-8):	Zarith - liczby całkowite dowolnej precyzji
 Name:		ocaml-zarith
-Version:	1.9.1
-Release:	2
+Version:	1.12
+Release:	5
 License:	LGPL v2 with linking exception
 Group:		Applications/Math
 #Source0Download: https://github.com/ocaml/Zarith/releases
 Source0:	https://github.com/ocaml/Zarith/archive/release-%{version}/Zarith-%{version}.tar.gz
-# Source0-md5:	af41b7534a4c91a8f774f04e307c1c66
-Patch0:		%{name}-x32.patch
+# Source0-md5:	bf368f3d9e20b6b446d54681afc05a04
 URL:		http://github.com/ocaml/Zarith
 BuildRequires:	bash
 BuildRequires:	gmp-devel
-BuildRequires:	ocaml >= 3.12.1
+BuildRequires:	ocaml >= 1:4.04
 BuildRequires:	ocaml-findlib
 BuildRequires:	perl-base
 %requires_eq	ocaml-runtime
+# does not work on x32 because sizeof(intnat) != sizeof(mp_limb_t) (4 != 8)
+ExclusiveArch:	%{ix86} %{x8664} %{arm} aarch64 ppc sparc sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,13 +59,11 @@ przy użyciu biblioteki Zarith.
 
 %prep
 %setup -q -n Zarith-release-%{version}
-%patch0 -p1
 
 %build
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags}" \
 ./configure \
-	-host %{_target_platform} \
 	-installdir $RPM_BUILD_ROOT%{_libdir}/ocaml \
 	-gmp
 
@@ -78,13 +77,7 @@ install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# move to dir pld ocamlfind looks
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
-%{__mv} $OCAMLFIND_DESTDIR/%{module}/META \
-	$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
-cat <<EOF >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}/META
-directory="+%{module}"
-EOF
+install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/
 
 # not required with system package manager
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so.owner
@@ -97,10 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc Changes LICENSE README.md
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dllzarith.so
 %dir %{_libdir}/ocaml/%{module}
+%{_libdir}/ocaml/%{module}/META
 %if %{with ocaml_opt}
 %attr(755,root,root) %{_libdir}/ocaml/%{module}/zarith.cmxs
 %endif
-%{_libdir}/ocaml/site-lib/%{module}
 
 %files devel
 %defattr(644,root,root,755)