From 1d2b19f0e27d7625c64b611f918ec62a463a15da3359037bb3a9fa7ce0e97f33 Mon Sep 17 00:00:00 2001 From: Mike Latimer Date: Mon, 8 Dec 2014 21:00:01 +0000 Subject: [PATCH] Accepting request 264467 from home:mlatimer:td Update spec file as per recommendations OBS-URL: https://build.opensuse.org/request/show/264467 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-fileutils?expand=0&rev=2 --- ocaml-fileutils.changes | 6 ++++++ ocaml-fileutils.spec | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ocaml-fileutils.changes b/ocaml-fileutils.changes index 069ea09..a878c1f 100644 --- a/ocaml-fileutils.changes +++ b/ocaml-fileutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 8 20:41:50 UTC 2014 - mlatimer@suse.com + +- Update spec file to use ocaml-rpm-macros, remove + ExclusiveArch, and ensure bytecode is built + ------------------------------------------------------------------- Fri Dec 5 18:02:46 UTC 2014 - mlatimer@suse.com diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index fb9a0f9..9f5a3dc 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -16,10 +16,9 @@ # -%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) - Name: ocaml-fileutils Version: 0.4.5 +%{ocaml_preserve_bytecode} Release: 0 Summary: OCaml library for common file and filename operations License: LGPL-2.0 with exceptions @@ -27,10 +26,10 @@ Group: Development/Libraries/Other Url: https://forge.ocamlcore.org/projects/ocaml-fileutils/ Source0: https://forge.ocamlcore.org/frs/download.php/1194/ocaml-fileutils-%{version}.tar.gz BuildRequires: ocaml >= 4.00.1 +BuildRequires: ocaml-rpm-macros >= 4.02.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 BuildRequires: ocaml-ocamldoc BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExcludeArch: sparc64 s390 s390x %description This library is intended to provide a basic interface to the most @@ -79,7 +78,7 @@ make %{?_smp_mflags} test %defattr(-,root,root,-) %doc COPYING.txt %{_libdir}/ocaml/fileutils -%if %{opt} +%if %{ocaml_native_compiler} %exclude %{_libdir}/ocaml/fileutils/*.a %exclude %{_libdir}/ocaml/fileutils/*.cmx %exclude %{_libdir}/ocaml/fileutils/*.cmxa @@ -90,7 +89,7 @@ make %{?_smp_mflags} test %files devel %defattr(-,root,root,-) %doc COPYING.txt AUTHORS.txt CHANGELOG.txt README.txt TODO.txt -%if %{opt} +%if %{ocaml_native_compiler} %{_libdir}/ocaml/fileutils/*.a %{_libdir}/ocaml/fileutils/*.cmx %{_libdir}/ocaml/fileutils/*.cmxa