Hello community, here is the log from the commit of package ocaml-camomile for openSUSE:Factory checked in at 2019-10-24 23:02:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-camomile (Old) and /work/SRC/openSUSE:Factory/.ocaml-camomile.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-camomile" Thu Oct 24 23:02:42 2019 rev:3 rq:738548 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-camomile/ocaml-camomile.changes 2017-08-18 15:01:25.563309206 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-camomile.new.2990/ocaml-camomile.changes 2019-10-24 23:02:47.404075943 +0200 @@ -1,0 +2,13 @@ +Mon Sep 30 12:34:56 UTC 2019 - [email protected] + +- use dune macros from ocaml-rpm-macros + +------------------------------------------------------------------- +Mon Sep 23 16:35:39 UTC 2019 - [email protected] + +- Update to version 1.0.2 + Fix build + Remove camomile-0.8.3-enable-debug.patch + Remove ocaml-camomile.bytecode.patch + +------------------------------------------------------------------- Old: ---- camomile-0.8.3-enable-debug.patch camomile-0.8.5.tar.bz2 ocaml-camomile.bytecode.patch New: ---- _service ocaml-camomile-1.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-camomile.spec ++++++ --- /var/tmp/diff_new_pack.UBwTYo/_old 2019-10-24 23:02:48.228076904 +0200 +++ /var/tmp/diff_new_pack.UBwTYo/_new 2019-10-24 23:02:48.240076918 +0200 @@ -17,7 +17,7 @@ Name: ocaml-camomile -Version: 0.8.5 +Version: 1.0.2 Release: 0 %{?ocaml_preserve_bytecode} Summary: Unicode library for OCaml @@ -27,17 +27,12 @@ License: LGPL-2.0+ Group: Development/Languages/OCaml Url: https://github.com/yoriyuki/Camomile/wiki -Source0: camomile-%{version}.tar.bz2 -# Use ocamlopt -g option to enable debuginfo. -Patch1: camomile-0.8.3-enable-debug.patch -Patch2: ocaml-camomile.bytecode.patch -BuildRequires: fdupes -BuildRequires: ocaml >= 3.12.1-12 -BuildRequires: ocaml-camlp4-devel -BuildRequires: ocaml-findlib-devel -BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.02.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: %{name}-%{version}.tar.xz +BuildRequires: ocaml +BuildRequires: ocaml-dune +BuildRequires: ocaml-rpm-macros >= 20191009 +BuildRequires: ocamlfind(bigarray) +BuildRequires: ocamlfind(str) %description Camomile is a Unicode library for ocaml. Camomile provides Unicode @@ -64,61 +59,24 @@ applications that use %{name}. %prep -%setup -q -n camomile-%{version} - -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build -# Parallel builds don't work. -./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir} -make do_byte -%if 0%{?ocaml_native_compiler} -make do_opt -%endif -make %{?_smp_mflags} dochtml -make %{?_smp_mflags} man +%ocaml_dune_setup +%ocaml_dune_build %install -export DESTDIR=%{buildroot} -export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR/stublibs $OCAMLFIND_DESTDIR/camomile -mkdir -p %{buildroot}%{_bindir} -make install prefix=%{buildroot}%{_prefix} DATADIR=%{buildroot}%{_datadir} -%if 0%{?ocaml_native_compiler} -cp tools/camomilecharmap.opt %{buildroot}%{_bindir}/camomilecharmap -cp tools/camomilelocaledef.opt %{buildroot}%{_bindir}/camomilelocaledef -%endif -%fdupes %{buildroot} - -%files -%defattr(-,root,root,-) -%doc COPYING README -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_bindir}/camomilecharmap -%{_bindir}/camomilelocaledef -%endif - -%files devel -%defattr(-,root,root,-) -%doc README dochtml/* -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.a -%{_libdir}/ocaml/*/*.cmx -%{_libdir}/ocaml/*/*.cmxa -%endif -%{_libdir}/ocaml/*/*.cma -%{_libdir}/ocaml/*/*.cmi -%{_libdir}/ocaml/*/*.mli -%{_libdir}/ocaml/*/META +%ocaml_dune_install +%ocaml_create_file_list + +%check +%ocaml_dune_test || : make check failed + +%files -f %{name}.files + +%files devel -f %{name}.files.devel %files data -%defattr(-,root,root,-) -%doc README %{_datadir}/camomile/ %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/yoriyuki/Camomile.git</param> <param name="scm">git</param> <param name="versionformat">1.0.2</param> <param name="revision">1.0.2</param> <param name="filename">ocaml-camomile</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>
