Fix a changelog entry

The release tarballs for the last couple of releases have now
been uploaded. Take the opportunity to switch to the canonical
format for the download URL.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

ocaml-libvirt.spec

@@ -1,24 +1,27 @@
-%undefine _package_note_flags
+# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
+ExcludeArch: %{ix86}
+
 Name:           ocaml-libvirt
-Version:        0.6.1.6
-Release:        1%{?dist}
+Version:        0.6.1.7
+Release:        17%{?dist}
 Summary:        OCaml binding for libvirt
-License:        LGPLv2+
+License:        LGPL-2.1-or-later
 
-URL:            http://libvirt.org/ocaml/
-#Source0:        http://libvirt.org/sources/ocaml/%{name}-%{version}.tar.gz
-# The tarball was not uploaded to the website at the time of packaging
-# so I built this using "make dist" in the source repo.
-Source0:        %{name}-%{version}.tar.gz
+URL:            https://ocaml.libvirt.org/
+Source0:        https://download.libvirt.org/ocaml/%{name}-%{version}.tar.gz
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml-rpm-macros
 
 BuildRequires:  libvirt-devel >= 0.2.1
 BuildRequires:  perl-interpreter
-BuildRequires:  gawk
+
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 
 
 %description
@@ -27,7 +30,7 @@ OCaml binding for libvirt.
 
 %package        devel
 Summary:        Development files for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
 %description    devel
@@ -39,13 +42,19 @@ developing applications that use %{name}.
 %setup -q
 %autopatch -p1
 
+# Fix detection of ocamlopt and ocamldoc
+# https://gitlab.com/libvirt/libvirt-ocaml/-/merge_requests/27
+sed -i '/AM_CONDITIONAL/s/"x"/"xno"/' configure.ac
+
+# Regenerate the configure script
+autoreconf -fi -I m4 .
+
 
 %build
+# Parallel builds do not work.
+unset MAKEFLAGS
 %configure
-make all doc
-%ifarch %{ocaml_native_compiler}
-make opt
-%endif
+make
 
 
 %install
@@ -54,37 +63,92 @@ export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-%ifarch %{ocaml_native_compiler}
-make install-opt
-%else
-make install-byte
-%endif
+make install
+%ocaml_files
 
 
-%files
-%doc COPYING.LIB README ChangeLog
-%{_libdir}/ocaml/libvirt
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/libvirt/*.a
-%exclude %{_libdir}/ocaml/libvirt/*.cmxa
-%exclude %{_libdir}/ocaml/libvirt/*.cmx
-%endif
-%exclude %{_libdir}/ocaml/libvirt/*.mli
-%{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
+%files -f .ofiles
+%doc README
+%license COPYING.LIB
 
 
-%files devel
-%doc COPYING.LIB README TODO.libvirt ChangeLog html/*
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/libvirt/*.a
-%{_libdir}/ocaml/libvirt/*.cmxa
-%{_libdir}/ocaml/libvirt/*.cmx
-%endif
-%{_libdir}/ocaml/libvirt/*.mli
+%files devel -f .ofiles-devel
+%doc README TODO.libvirt
+%license COPYING.LIB
 
 
 %changelog
+* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.7-17
+- OCaml 5.4.0 rebuild
+
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.7-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 0.6.1.7-15
+- Rebuild to fix OCaml dependencies
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.7-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan  9 2025 Jerry James <loganjerry@gmail.com> - 0.6.1.7-13
+- OCaml 5.3.0 rebuild for Fedora 42
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.7-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.7-11
+- OCaml 5.2.0 ppc64le fix
+
+* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.7-10
+- OCaml 5.2.0 for Fedora 41
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.7-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.7-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.7-7
+- OCaml 5.1.1 + s390x code gen fix for Fedora 40
+
+* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.7-6
+- OCaml 5.1.1 rebuild for Fedora 40
+
+* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.7-5
+- OCaml 5.1 rebuild for Fedora 40
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.7-3
+- OCaml 5.0 rebuild for Fedora 39
+
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 0.6.1.7-2
+- OCaml 5.0.0 rebuild
+- New project URL
+- Convert License tag to SPDX
+- Fix build on bytecode-only architectures
+- Use %%license macro
+- Use new OCaml macros
+
+* Mon Feb 13 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.7-1
+- New upstream version 0.6.1.7
+- Do not try parallel builds.
+- Upstream now uses automake.
+- Remove ChangeLog file and HTML docs, dropped upstream.
+
+* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.6-5
+- Rebuild OCaml packages for F38
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.6-2
+- OCaml 4.14.0 rebuild
+
 * Thu Apr 28 2022 Richard W.M. Jones <rjones@redhat.com> - 0.6.1.6-1
 - New upstream version 0.6.1.6
 - Remove patches which are all upstream.

sources

@@ -1 +1 @@
-SHA512 (ocaml-libvirt-0.6.1.6.tar.gz) = 9846b75f2107368eef1d538c5accbc5ac9472f59dd5e0e1e404c3a417e6f25fae4b076a912ff396f2211fda1fd1ef936f6d039e865c015747a79722addec9ab1
+SHA512 (ocaml-libvirt-0.6.1.7.tar.gz) = ec4ebb69701b15a0c258e78f0e9eb9b1f2a75a86384392e8622ad7f4c85dfc598d51d95698835a2ea401b5647b3ad325ff820cbb7d0e524551ff07c26a54de2b

tests/basic-test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -
+set -e
+set -x
+
+# Compile trivial libvirt program.
+echo 'print_endline Libvirt_version.version' > virttest.ml
+ocamlfind ocamlopt -package libvirt virttest.ml -linkpkg -o virttest
+./virttest

tests/tests.yml

@@ -0,0 +1,14 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    required_packages:
+    - ocaml
+    - ocaml-findlib
+    - ocaml-libvirt-devel
+    - libvirt-devel
+    tests:
+    - simple:
+        dir: .
+        run: ./basic-test.sh