From 5d59b40be5309a36664f1822328354f5fb0d4374 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:56:59 +0100 Subject: [PATCH] update to 2.2.5 [release 2.2.5-1mamba;Sun Feb 06 2022] --- README.md | 1 + ocaml-ounit.spec | 67 ++++++++++++++++++++++-------------------------- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 43f9a4e..8e74370 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # ocaml-ounit Ocaml Unit testing framework. + diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec index b21edb1..0e7c555 100644 --- a/ocaml-ounit.spec +++ b/ocaml-ounit.spec @@ -1,30 +1,31 @@ -## this macro only works for packages with name matching the regexp "ocaml-.*" -%define ocamlpck oUnit +%define ocamlpck ounit2 Name: ocaml-ounit -Version: 2.0.0 +Version: 2.2.5 Release: 1mamba Summary: Ocaml Unit testing framework Group: System/Libraries/OCaml Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: http://ounit.forge.ocamlcore.org/ -Source: http://forge.ocamlcore.org/frs/download.php/1258/ounit-%{version}.tar.gz +URL: https://github.com/gildor478/ounit +Source: https://github.com/gildor478/ounit.git/v%{version}/ounit-%{version}.tar.bz2 License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ocaml +BuildRequires: ocaml-lwt-devel +BuildRequires: ocaml-result +BuildRequires: ocaml-seq-devel ## AUTOBUILDREQ-END BuildRequires: ocaml BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-findlib Requires: ocaml-runtime -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Ocaml Unit testing framework. -## remove the following two blocks if there's no devel files %package devel Group: Development/Libraries/OCaml Summary: Development files for %{name} @@ -33,55 +34,49 @@ Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description devel This package contains libraries and signature files for developing applications that use %{name}. +%debug_package + %prep %setup -q -n ounit-%{version} %build -./configure \ - --prefix %{_prefix} \ - --localstatedir %{_localstatedir} \ - --sharedstatedir %{_sharedstatedir} \ - --sysconfdir %{_sysconfdir} \ - --enable-tests \ - --enable-docs \ - --destdir=%{buildroot} - -%make all -j1 +dune build --release --verbose %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -export OCAMLFIND_DESTDIR=%{buildroot}$(ocamlfind printconf destdir) -export DLLDIR=$OCAMLFIND_DESTDIR/stublibs +DESTDIR="%{buildroot}" dune install --prefix '%{_prefix}' --libdir '%{_lib}/ocaml' --release --verbose -install -d $OCAMLFIND_DESTDIR/%{ocamlpck} -install -d $OCAMLFIND_DESTDIR/stublibs - -%makeinstall +rm -rf %{buildroot}/usr/doc %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %files %defattr(-,root,root) +%dir %{_libdir}/ocaml/ounit +%{_libdir}/ocaml/ounit/* +%dir %{_libdir}/ocaml/ounit-lwt +%{_libdir}/ocaml/ounit-lwt/* %dir %{_libdir}/ocaml/%{ocamlpck} -%{_libdir}/ocaml/%{ocamlpck}/META -%{_libdir}/ocaml/%{ocamlpck}/*.cma -%{_libdir}/ocaml/%{ocamlpck}/*.cmi -%{_libdir}/ocaml/%{ocamlpck}/*.cmxs -%{_libdir}/ocaml/%{ocamlpck}/*.ml +%{_libdir}/ocaml/%{ocamlpck}*/* +%exclude %{_libdir}/ocaml/%{ocamlpck}*/*.a +%exclude %{_libdir}/ocaml/%{ocamlpck}*/*.cmx +%exclude %{_libdir}/ocaml/%{ocamlpck}*/*.cmxa +%exclude %{_libdir}/ocaml/%{ocamlpck}*/*.mli +%exclude %{_libdir}/ocaml/%{ocamlpck}_lwt/*.mli %doc LICENSE.txt %files devel %defattr(-,root,root) -%{_libdir}/ocaml/%{ocamlpck}/*.a -%{_libdir}/ocaml/%{ocamlpck}/*.cmx -%{_libdir}/ocaml/%{ocamlpck}/*.cmxa -%{_libdir}/ocaml/%{ocamlpck}/*.mli -%dir %{_docdir}/ounit -%{_docdir}/ounit/* -#%doc CHANGES README -#%doc doc/html/ +%{_libdir}/ocaml/%{ocamlpck}*/*.a +%{_libdir}/ocaml/%{ocamlpck}*/*.cmx +%{_libdir}/ocaml/%{ocamlpck}*/*.cmxa +%{_libdir}/ocaml/%{ocamlpck}*/*.mli +%doc CHANGES.md README.md %changelog +* Sun Feb 06 2022 Silvan Calarco 2.2.5-1mamba +- update to 2.2.5 + * Thu May 26 2016 Silvan Calarco 2.0.0-1mamba - package created using the webbuild interface