From 006edb52f27ee5721ebbb5cee393a3891aa43b19b1a11d4441c34d63c237fe69 Mon Sep 17 00:00:00 2001
From: Mike Latimer <mlatimer@suse.com>
Date: Mon, 8 Dec 2014 20:31:51 +0000
Subject: [PATCH] Accepting request 264462 from home:mlatimer:td

Update spec file as per recommendations

OBS-URL: https://build.opensuse.org/request/show/264462
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=2
---
 ocaml-calendar.changes | 6 ++++++
 ocaml-calendar.spec    | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ocaml-calendar.changes b/ocaml-calendar.changes
index 122967d..815002b 100644
--- a/ocaml-calendar.changes
+++ b/ocaml-calendar.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  8 20:18:19 UTC 2014 - mlatimer@suse.com
+
+- Update spec file to use ocaml-rpm-macros, remove
+  ExclusiveArch, and ensure bytecode is built
+
 -------------------------------------------------------------------
 Fri Dec  5 17:20:02 UTC 2014 - mlatimer@suse.com
 
diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec
index d30f226..403be30 100644
--- a/ocaml-calendar.spec
+++ b/ocaml-calendar.spec
@@ -16,7 +16,6 @@
 #
 
 
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 # Ignore all generated modules *except* CalendarLib, since everything
 # now appears in that namespace.
 %global __ocaml_requires_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version
@@ -24,6 +23,7 @@
 
 Name:           ocaml-calendar
 Version:        2.04
+%{ocaml_preserve_bytecode}
 Release:        0
 Summary:        Objective Caml library for managing dates and times
 License:        LGPL-2.0
@@ -33,10 +33,10 @@ Source0:        http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.t
 Patch1:         calendar-2.04-enable-debug.patch
 BuildRequires:  gawk
 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
 Objective Caml library for managing dates and times.
@@ -75,7 +75,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING
 %{_libdir}/ocaml/calendar
-%if %{opt}
+%if %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/calendar/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/calendar/*.mli
@@ -83,7 +83,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags}
 %files devel
 %defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING calendarFAQ-2.6.txt doc/*
-%if %{opt}
+%if %{ocaml_native_compiler}
 %{_libdir}/ocaml/calendar/*.cmx
 %endif
 %{_libdir}/ocaml/calendar/*.mli