[packages/ocaml-batteries] - new URLs, updated to 3.4.0

[qboosh]

commit fe1967d8c86bbeadcd8f85294a1e64a7fb9405c8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jan 1 01:57:56 2022 +0100

    - new URLs, updated to 3.4.0

 ocaml-batteries.spec | 80 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 31 deletions(-)
---
diff --git a/ocaml-batteries.spec b/ocaml-batteries.spec
index 6493291..105daf0 100644
--- a/ocaml-batteries.spec
+++ b/ocaml-batteries.spec
@@ -1,27 +1,44 @@
+#
+# Conditional build:
+%bcond_without	ocaml_opt	# native optimized binaries (bytecode is always built)
+
+# 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
+
 %define		module	batteries
 Summary:	OCaml Batteries Included
 Summary(pl.UTF-8):	OCaml Batteries Included - baterie dołączone do OCamla
 Name:		ocaml-%{module}
-Version:	2.2
-Release:	3
-License:	LGPL
+Version:	3.4.0
+Release:	1
+License:	LGPL v2.1+ with OCaml linking exception
 Group:		Libraries
-Source0:	https://forge.ocamlcore.org/frs/download.php/1363/%{module}-%{version}.tar.gz
-# Source0-md5:	42063b5f2da9a311ff16799b8bec4ba5
-URL:		http://batteries.forge.ocamlcore.org/
-BuildRequires:	ocaml >= 3.04-7
+#Source0Download: https://github.com/ocaml-batteries-team/batteries-included/tags
+Source0:	https://github.com/ocaml-batteries-team/batteries-included/archive/v%{version}/batteries-included-%{version}.tar.gz
+# Source0-md5:	66b6e0b25769fc2363972c6a6ab6ac33
+URL:		https://github.com/ocaml-batteries-team/batteries-included
+BuildRequires:	ocaml >= 1:3.12.1
+BuildRequires:	ocaml-findlib >= 1.5.3
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		debug_package	%{nil}
 
 %description
+"OCaml Batteries Included" or just Batteries is a community-maintained
+foundation library for your OCaml projects.
+
 This package contains files needed to run bytecode executables using
-OCaml batteries library.
+OCaml Batteries library.
 
 %description -l pl.UTF-8
+"OCaml Batteries Included" lub po prostu Batteries to utrzymywana
+przez społeczność biblioteka podstawowa dla projektów w OCamlu.
+
 Pakiet ten zawiera binaria potrzebne do uruchamiania programów
-używających biblioteki OCamla batteries.
+używających biblioteki OCamla Batteries.
 
 %package devel
 Summary:	OCaml Batteries Included - development part
@@ -39,7 +56,7 @@ Pakiet ten zawiera pliki niezbędne do tworzenia programów w OCamlu
 używających biblioteki batteries.
 
 %prep
-%setup -q -n %{module}-%{version}
+%setup -q -n batteries-included-%{version}
 
 %build
 %{__make} -j1 all
@@ -47,39 +64,40 @@ używających biblioteki batteries.
 %install
 rm -rf $RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
+install -d $OCAMLFIND_DESTDIR
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-# move to dir pld ocamlfind looks
-install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
-mv $OCAMLFIND_DESTDIR/%{module}/META \
-	$RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}
-cat <<EOF >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/%{module}/META
-directory="+%{module}"
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%dir %{_libdir}/ocaml/%{module}
-%attr(755,root,root) %{_libdir}/ocaml/%{module}/*.cmxs
-%{_libdir}/ocaml/%{module}/battop.ml
-%attr(755,root,root) %{_libdir}/ocaml/%{module}/ocaml
-%{_libdir}/ocaml/%{module}/ocamlinit
-%{_libdir}/ocaml/site-lib/%{module}
+%doc ChangeLog FAQ LICENSE README.md
+%dir %{_libdir}/ocaml/batteries
+%{_libdir}/ocaml/batteries/META
+%{_libdir}/ocaml/batteries/battop.ml
+%attr(755,root,root) %{_libdir}/ocaml/batteries/ocaml
+%{_libdir}/ocaml/batteries/ocamlinit
+%{_libdir}/ocaml/batteries/*.cma
+%if %{with ocaml_opt}
+%attr(755,root,root) %{_libdir}/ocaml/batteries/*.cmxs
+%endif
 
 %files devel
 %defattr(644,root,root,755)
-%doc LICENSE
-%{_libdir}/ocaml/%{module}/*.cm[xia]
-%{_libdir}/ocaml/%{module}/*.cmo
-%{_libdir}/ocaml/%{module}/*.mli
-%{_libdir}/ocaml/%{module}/*.[ao]
-%{_libdir}/ocaml/%{module}/*.cmxa
+%{_libdir}/ocaml/batteries/*.cmi
+%{_libdir}/ocaml/batteries/*.cmt
+%{_libdir}/ocaml/batteries/*.cmti
+%{_libdir}/ocaml/batteries/*.cmo
+%{_libdir}/ocaml/batteries/*.mli
+%if %{with ocaml_opt}
+%{_libdir}/ocaml/batteries/*.a
+%{_libdir}/ocaml/batteries/*.cmx
+%{_libdir}/ocaml/batteries/*.cmxa
+%endif
 %{_examplesdir}/%{name}-%{version}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-batteries.git/commitdiff/fe1967d8c86bbeadcd8f85294a1e64a7fb9405c8