From 122dbc509fb97e6904854f9dc1a3ae55500778500453b38291b3f7583a0f6c0c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 1 Nov 2019 22:45:59 +0000 Subject: [PATCH] - 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 | 6 +- ocaml-libvirt-0.6.1.4.20160205.8853f5a.tar.xz | 3 - ocaml-libvirt-0.6.1.5.20191031.6b9affd.tar.xz | 3 + ocaml-libvirt.changes | 6 + ocaml-libvirt.spec | 150 +++--------------- 5 files changed, 30 insertions(+), 138 deletions(-) delete mode 100644 ocaml-libvirt-0.6.1.4.20160205.8853f5a.tar.xz create mode 100644 ocaml-libvirt-0.6.1.5.20191031.6b9affd.tar.xz diff --git a/_service b/_service index d3d1662..79c79f6 100644 --- a/_service +++ b/_service @@ -1,9 +1,9 @@ - git://git.annexia.org/git/ocaml-libvirt.git + https://github.com/olafhering/libvirt-ocaml.git git - 0.6.1.4.%cd.%h - master + 0.6.1.5.%cd.%h + dune ocaml-libvirt diff --git a/ocaml-libvirt-0.6.1.4.20160205.8853f5a.tar.xz b/ocaml-libvirt-0.6.1.4.20160205.8853f5a.tar.xz deleted file mode 100644 index c432d36..0000000 --- a/ocaml-libvirt-0.6.1.4.20160205.8853f5a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7469bf554cc9c7da42a3015cd7561aa759c60c2c2f962f0a6d5dddab781d9e79 -size 74392 diff --git a/ocaml-libvirt-0.6.1.5.20191031.6b9affd.tar.xz b/ocaml-libvirt-0.6.1.5.20191031.6b9affd.tar.xz new file mode 100644 index 0000000..9ffcdf6 --- /dev/null +++ b/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 diff --git a/ocaml-libvirt.changes b/ocaml-libvirt.changes index 20ef8f6..d0de434 100644 --- a/ocaml-libvirt.changes +++ b/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 diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec index 63ad223..b0232b8 100644 --- a/ocaml-libvirt.spec +++ b/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-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.03 +BuildRequires: ocaml-dune +BuildRequires: ocaml-rpm-macros >= 20191101 +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 ' -s|@PACKAGE_NAME@|libvirt| -s|@PACKAGE_VERSION@|%{version}| -' 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 +dune_release_pkgs='libvirt' +%ocaml_dune_setup +%ocaml_dune_build %install -%ocaml_oasis_findlib_install -# -mkdir -vp %{buildroot}/etc/ld.so.conf.d/ -tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_ -%{_libdir}/ocaml/libvirt -_EOF_ -# +%ocaml_dune_install +%ocaml_create_file_list -%post -p /sbin/ldconfig +%check +dune_test_tolerate_fail='dune_test_tolerate_fail' +%ocaml_dune_test -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc COPYING.LIB README -/etc/ld.so.conf.d/*.conf +%files -f %{name}.files %{_bindir}/* -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmxs -%endif -%{_libdir}/ocaml/*/*.so -%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 +%files devel -f %{name}.files.devel