- Require current dune macros

- Update to version 0.6.1.5, via _service file

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-libvirt?expand=0&rev=24

_service

@@ -1,9 +1,9 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="url">git://git.annexia.org/git/ocaml-libvirt.git</param>
+    <param name="url">https://github.com/olafhering/libvirt-ocaml.git</param>
     <param name="scm">git</param>
-    <param name="versionformat">0.6.1.4.%cd.%h</param>
+    <param name="versionformat">0.6.1.5.%cd.%h</param>
-    <param name="revision">master</param>
+    <param name="revision">dune</param>
     <param name="filename">ocaml-libvirt</param>
   </service>
   <service name="recompress" mode="disabled">

ocaml-libvirt-0.6.1.4.20160205.8853f5a.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7469bf554cc9c7da42a3015cd7561aa759c60c2c2f962f0a6d5dddab781d9e79
-size 74392

ocaml-libvirt-0.6.1.5.20191031.6b9affd.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72b7e372ef41e0e6b5271a815939b8b478aa7d81902d66902910e4ae58282707
+size 56464

ocaml-libvirt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  1 12:34:56 UTC 2019 - ohering@suse.de
+
+- Require current dune macros
+- Update to version 0.6.1.5, via _service file
+
 -------------------------------------------------------------------
 Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
 

ocaml-libvirt.spec

@@ -12,12 +12,12 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           ocaml-libvirt
-Version:        0.6.1.4.20160205.8853f5a
+Version:        0.6.1.5.20191031.6b9affd
 Release:        0
 %{?ocaml_preserve_bytecode}
 Summary:        OCaml binding for libvirt
@@ -26,13 +26,12 @@ Group:          Development/Languages/OCaml
 Url:            http://libvirt.org/ocaml/
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  ocaml
-BuildRequires:  ocaml-oasis
+BuildRequires:  ocaml-dune
-BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ocaml-rpm-macros >= 20191101
-BuildRequires:  ocaml-rpm-macros >= 4.03
+BuildRequires:  ocamlfind(dune.configurator)
+BuildRequires:  ocamlfind(unix)
 BuildRequires:  perl
 BuildRequires:  pkgconfig(libvirt)
-Requires:       libvirt-client >= 0.9.10-3
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 OCaml binding for libvirt.
@@ -41,142 +40,29 @@ OCaml binding for libvirt.
 Summary:        Development files for %{name}
 Group:          Development/Languages/OCaml
 Requires:       %{name} = %{version}
+Requires:       pkgconfig(libvirt)
 
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-sed '
+dune_release_pkgs='libvirt'
-s|@PACKAGE_NAME@|libvirt|
+%ocaml_dune_setup
-s|@PACKAGE_VERSION@|%{version}|
+%ocaml_dune_build
-' libvirt/libvirt_version.ml.in > libvirt/libvirt_version.ml
-#
-tee config.h <<'_EOF_'
-_EOF_
-#
-libvirt_version="`pkg-config --modversion libvirt`"
-libvirt_cflags="`pkg-config --cflags libvirt`"
-libvirt_libs="`pkg-config --libs libvirt`"
-# contains CFLAGS ...
-case "${libvirt_version}" in
-  1.1.*) libvirt_libs="-lvirt" ;;
-  1.2.5) libvirt_libs="-lvirt" ;;
-esac
-#
-pushd libvirt
-mv -v libvirt_c.c libvirt_c.c.txt
-perl -w generator.pl
-diff -u libvirt_c.c.txt libvirt_c.c || :
-popd
-# obs service changes every ^Version line ...
-sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_
-OASISFormat: 0.4
-Name:        libvirt
-Version:     0
-Synopsis:    binding for libvirt
-Authors:     Richard W.M. Jones
-License:     %{license}
-Plugins:     META(`oasis version`)
-BuildTools:  ocamlbuild
-
-Library mllibvirt
- Path: libvirt
- Install: true
- Modules: Libvirt, Libvirt_version
- FindlibName: libvirt
- BuildDepends: unix
- CSources: libvirt_c.c
- CCOpt: %{optflags} -I$PWD -I$PWD/libvirt -Werror -D_GNU_SOURCE ${libvirt_cflags}
- CCLib: ${libvirt_libs}
-
-Document libvirt
- Title:                API reference for libvirt
- Type:                 ocamlbuild
- BuildTools+:          ocamldoc
- InstallDir:           \$htmldir
- Install:              true
- XOCamlbuildPath:      .
- XOCamlbuildLibraries: libvirt
-
-Executable "%{name}-domain_events"
- Install: true
- Path: examples
- MainIs: domain_events.ml
- CompiledObject: best
- BuildDepends: libvirt
-
-Executable "%{name}-get_cpu_stats"
- Install: true
- Path: examples
- MainIs: get_cpu_stats.ml
- CompiledObject: best
- BuildDepends: libvirt
-
-Executable "%{name}-list_domains"
- Install: true
- Path: examples
- MainIs: list_domains.ml
- CompiledObject: best
- BuildDepends: libvirt
-
-Executable "%{name}-node_info"
- Install: true
- Path: examples
- MainIs: node_info.ml
- CompiledObject: best
- BuildDepends: libvirt
-_EOF_
-%oasis_setup
-%ocaml_oasis_configure --enable-docs
-%ocaml_oasis_build
-%ocaml_oasis_doc
 
 %install
-%ocaml_oasis_findlib_install
+%ocaml_dune_install
-#
+%ocaml_create_file_list
-mkdir -vp %{buildroot}/etc/ld.so.conf.d/
-tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
-%{_libdir}/ocaml/libvirt
-_EOF_
-#
 
-%post   -p /sbin/ldconfig
+%check
+dune_test_tolerate_fail='dune_test_tolerate_fail'
+%ocaml_dune_test
 
-%postun -p /sbin/ldconfig
+%files -f %{name}.files
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING.LIB README
-/etc/ld.so.conf.d/*.conf
 %{_bindir}/*
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
-%{_libdir}/ocaml/*/*.so
 
-%files devel
+%files devel -f %{name}.files.devel
-%defattr(-,root,root,-)
-%doc COPYING.LIB README
-%{oasis_docdir_html}
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%{_libdir}/ocaml/*/*.a
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.annot
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmt
-%{_libdir}/ocaml/*/*.cmti
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/META
-
-%changelog