[packages/ocaml-camomile] - complete ocaml_opt archs list - release 4 (ocaml rebuild)

qboosh qboosh at pld-linux.org
Sun Jul 19 08:42:03 CEST 2015


commit 61475ba853f3295e9b2e5eb2df98ae5011791f0b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 19 08:43:20 2015 +0200

    - complete ocaml_opt archs list
    - release 4 (ocaml rebuild)

 ocaml-camomile.spec | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec
index 9b0d2ee..e0ea43c 100644
--- a/ocaml-camomile.spec
+++ b/ocaml-camomile.spec
@@ -2,22 +2,16 @@
 # Conditional build:
 %bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
 
-%ifarch x32
-# not yet available on x32 (ocaml 4.02.1), remove when upstream will support it
+# not yet available on x32 (ocaml 4.02.1), update when upstream will support it
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
 %undefine	with_ocaml_opt
 %endif
 
-%if %{without ocaml_opt}
-%define		no_install_post_strip	1
-# no opt means no native binary, stripping bytecode breaks such programs
-%define		_enable_debug_packages	0
-%endif
-
 Summary:	Camomile - comprehensive Unicode library for OCaml
 Summary(pl.UTF-8):	Camomile - obszerna biblioteka unikodowa dla OCamla
 Name:		ocaml-camomile
 Version:	0.8.3
-Release:	3
+Release:	4
 License:	LGPL v2+ with linking exception
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/camomile/camomile-%{version}.tar.bz2
@@ -29,6 +23,12 @@ BuildRequires:	ocaml-findlib
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{without ocaml_opt}
+%define		no_install_post_strip	1
+# no opt means no native binary, stripping bytecode breaks such programs
+%define		_enable_debug_packages	0
+%endif
+
 %description
 Camomile is a comprehensive Unicode library for OCaml. Camomile
 provides Unicode character type, UTF-8, UTF-16, UTF-32 strings,
@@ -101,8 +101,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/ocaml/camomile
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/camomile/camomile.a
-%{_libdir}/ocaml/camomile/camomile.cmx*
+%{_libdir}/ocaml/camomile/camomile.cmxa
+%{_libdir}/ocaml/camomile/camomileLibrary*.cma
+%{_libdir}/ocaml/camomile/camomileLibrary*.cmi
 %endif
-%{_libdir}/ocaml/camomile/camomile.cma*
-%{_libdir}/ocaml/camomile/camomileLibrary*.cm[ixa]*
+%{_libdir}/ocaml/camomile/camomile.cma
+%{_libdir}/ocaml/camomile/camomileLibrary*.cmx
+%{_libdir}/ocaml/camomile/camomileLibrary*.cmxa
 %{_libdir}/ocaml/site-lib/camomile
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-camomile.git/commitdiff/61475ba853f3295e9b2e5eb2df98ae5011791f0b



More information about the pld-cvs-commit mailing list