[packages/ocaml-calendar] - added base package with modules which can be loaded dynamically - added ocaml_opt bcond - release

[qboosh]

commit 73725879956650c85204c064b9cf0075ad0ed747
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 24 16:40:32 2015 +0200

    - added base package with modules which can be loaded dynamically
    - added ocaml_opt bcond
    - release 2

 ocaml-calendar.spec | 57 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 15 deletions(-)
---
diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec
index 8ad2a9c..d212e00 100644
--- a/ocaml-calendar.spec
+++ b/ocaml-calendar.spec
@@ -1,9 +1,17 @@
+#
+# Conditional build:
+%bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
+
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
+%undefine	with_ocaml_opt
+%endif
+
 %define		ocaml_ver	1:3.10.0
 Summary:	OCaml library managing dates and times
 Summary(pl.UTF-8):	Biblioteka OCamla do obsługi daty i czasu
 Name:		ocaml-calendar
 Version:	2.04
-Release:	1
+Release:	2
 License:	LGPL + OCaml linking exception
 Group:		Libraries
 Source0:	http://forge.ocamlcore.org/frs/download.php/1481/calendar-%{version}.tar.gz
@@ -11,6 +19,7 @@ Source0:	http://forge.ocamlcore.org/frs/download.php/1481/calendar-%{version}.ta
 URL:		https://forge.ocamlcore.org/projects/calendar/
 BuildRequires:	ocaml >= %{ocaml_ver}
 BuildRequires:	ocaml-findlib
+BuildRequires:	sed >= 4.0
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,15 +36,22 @@ Summary:	OCaml library managing dates and times
 Summary(pl.UTF-8):	Biblioteka OCamla do obsługi daty i czasu
 Group:		Development/Libraries
 %requires_eq	ocaml
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 The Calendar library is an OCaml library providing a set of operations
 over dates and times.
 
+This package contains files needed to develop OCaml programs using
+calendar library.
+
 %description devel -l pl.UTF-8
 Calendar to biblioteka OCamla udostępniająca operacje na datach i
 czasie.
 
+Ten pakiet zawiera pliki niezbędne do tworzenia programów używających
+biblioteki calendar.
+
 %prep
 %setup -q -n calendar-%{version}
 
@@ -46,32 +62,43 @@ czasie.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{calendar,stublibs}
 
-%{__make} \
-	 install
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -r tests/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -pr tests/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-# META for findlib
+# move META for findlib
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/calendar
-echo 'directory = "+calendar"' >> META
-install META $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/calendar
-%{__sed} -i -e 's/calendarLib.cm[ox] //' $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/calendar/META
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/ocaml/calendar/META $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/calendar
+echo 'directory = "+calendar"' >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/calendar/META
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files devel
+%files
 %defattr(644,root,root,755)
-%doc README src/*.mli
+%doc README
 %dir %{_libdir}/ocaml/calendar
-%{_libdir}/ocaml/calendar/*.cm[ixa]*
-%{_libdir}/ocaml/calendar/*.cmo
-%{_libdir}/ocaml/calendar/*.mli
-%{_libdir}/ocaml/calendar/*.[ao]
+%{_libdir}/ocaml/calendar/calendarLib.cma
+%{_libdir}/ocaml/calendar/calendarLib.cmo
+%if %{with ocaml_opt}
+%attr(755,root,root) %{_libdir}/ocaml/calendar/calendarLib.cmxs
+%endif
 %{_libdir}/ocaml/site-lib/calendar
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/ocaml/calendar/calendarLib.cmi
+# doc?
+%{_libdir}/ocaml/calendar/*.mli
+%if %{with ocaml_opt}
+%{_libdir}/ocaml/calendar/calendarLib.cmx
+%{_libdir}/ocaml/calendar/calendarLib.cmxa
+%{_libdir}/ocaml/calendar/calendarLib.a
+%{_libdir}/ocaml/calendar/calendarLib.o
+%endif
 %{_examplesdir}/%{name}-%{version}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-calendar.git/commitdiff/73725879956650c85204c064b9cf0075ad0ed747