[packages/ocaml-gmp] - unify ocaml_opt bcond name - release 4 (ocaml rebuild)

qboosh qboosh at pld-linux.org
Sat Jul 18 18:38:21 CEST 2015


commit e9ed3d6fd27605d30b560a7ad614380ab407ef6f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 18 18:39:36 2015 +0200

    - unify ocaml_opt bcond name
    - release 4 (ocaml rebuild)

 ocaml-gmp.spec | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/ocaml-gmp.spec b/ocaml-gmp.spec
index 0ed9db0..2211232 100644
--- a/ocaml-gmp.spec
+++ b/ocaml-gmp.spec
@@ -1,16 +1,16 @@
 #
 # Conditional build:
-%bcond_without	opt		# build opt
+%bcond_without	ocaml_opt	# build opt (native code)
 
-%ifarch x32
-%undefine	with_opt
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+%undefine	with_ocaml_opt
 %endif
 
 Summary:	GMP binding for OCaml
 Summary(pl.UTF-8):	Wiązania GMP dla OCamla
 Name:		ocaml-gmp
 Version:	20120224
-Release:	3
+Release:	4
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://www-verimag.imag.fr/~monniaux/download/mlgmp_%{version}.tar.gz
@@ -57,7 +57,7 @@ biblioteki MLGMP.
 %{__make} clean
 
 %{__make} \
-	%{?with_opt:HAS_OPT=1} \
+	%{?with_ocaml_opt:HAS_OPT=1} \
 	CC="%{__cc} %{rpmcflags} -fPIC" \
 	CFLAGS_MISC="%{rpmcflags} -fPIC -Wall -Wno-unused -Werror" \
 	GMP_INCLUDES=
@@ -66,7 +66,7 @@ biblioteki MLGMP.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	%{?with_opt:HAS_OPT=1} \
+	%{?with_ocaml_opt:HAS_OPT=1} \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/gmp
@@ -79,6 +79,9 @@ archive(native) = "gmp.cmxa"
 linkopts = ""
 EOF
 
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/gmp/gmp.mli
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,9 +94,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc *.mli
 %dir %{_libdir}/ocaml/gmp
-%{_libdir}/ocaml/gmp/gmp.cm[ixa]*
-%if %{with opt}
+%{_libdir}/ocaml/gmp/gmp.cma
+%{_libdir}/ocaml/gmp/gmp.cmi
+%if %{with ocaml_opt}
 %{_libdir}/ocaml/gmp/gmp.a
+%{_libdir}/ocaml/gmp/gmp.cmxa
 %endif
 %{_libdir}/ocaml/gmp/libgmpstub.a
 %{_libdir}/ocaml/site-lib/gmp
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-gmp.git/commitdiff/e9ed3d6fd27605d30b560a7ad614380ab407ef6f



More information about the pld-cvs-commit mailing list