Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package opam for openSUSE:Factory checked in 
at 2022-04-05 19:56:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opam (Old)
 and      /work/SRC/openSUSE:Factory/.opam.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "opam"

Tue Apr  5 19:56:04 2022 rev:11 rq:967087 version:2.1.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/opam/opam.changes        2021-11-13 
22:49:03.209274239 +0100
+++ /work/SRC/openSUSE:Factory/.opam.new.1900/opam.changes      2022-04-05 
19:56:37.365451367 +0200
@@ -1,0 +2,6 @@
+Mon Apr  4 04:04:04 UTC 2022 - oher...@suse.de
+
+- Update to version 2.1.2
+  See included CHANGES for details
+
+-------------------------------------------------------------------

Old:
----
  opam-2.1.1.tar.xz

New:
----
  opam-2.1.2.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ opam.spec ++++++
--- /var/tmp/diff_new_pack.OZEqcw/_old  2022-04-05 19:56:37.789446641 +0200
+++ /var/tmp/diff_new_pack.OZEqcw/_new  2022-04-05 19:56:37.793446595 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package opam
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
 
 
 Name:           opam
-Version:        2.1.1
+Version:        2.1.2
 Release:        0
 Summary:        Source-based package manager for OCaml
 License:        LGPL-2.1-only WITH OCaml-LGPL-linking-exception
 Group:          System/Packages
 URL:            https://opam.ocaml.org/
-Source:         %{name}-%{version}.tar.xz
+Source:         %name-%version.tar.xz
 Patch0:         opam.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -31,7 +31,7 @@
 BuildRequires:  ocaml
 BuildRequires:  ocaml-cppo
 BuildRequires:  ocaml-dune
-BuildRequires:  ocaml-rpm-macros >= 20211027
+BuildRequires:  ocaml-rpm-macros >= 20220222
 BuildRequires:  ocamlfind(bigarray)
 BuildRequires:  ocamlfind(cmdliner)
 BuildRequires:  ocamlfind(cudf)
@@ -42,7 +42,7 @@
 BuildRequires:  ocamlfind(re)
 BuildRequires:  ocamlfind(unix)
 
-Requires:       %{name}-installer%{?_isa} = %{version}-%{release}
+Requires:       %name-installer%{?_isa} = %version-%release
 
 Requires:       bubblewrap
 
@@ -70,20 +70,20 @@
 %package installer
 Summary:        Standalone tool for opam install files
 Group:          System/Packages
-Requires:       %{name} = %{version}-%{release}
+Requires:       %name = %version-%release
 
 %description installer
 Handles (un)installation of package files following instructions from
 OPAM *.install files.
 
 %package        devel
-Summary:        Development files for %{name}
+Summary:        Development files for %name
 Group:          Development/Languages/OCaml
-Requires:       %{name} = %{version}
+Requires:       %name = %version
 
 %description    devel
-The %{name}-devel package contains libraries and signature files for
-developing applications that use %{name}.
+The %name-devel package contains libraries and signature files for
+developing applications that use %name.
 
 %prep
 %autosetup -p1
@@ -107,14 +107,14 @@
 %ocaml_dune_install
 %ocaml_create_file_list
 
-%files -f %{name}.files
-%{_bindir}/opam
-%{_bindir}/opam-admin.top
-%{_mandir}/man*/*
+%files -f %name.files
+%_bindir/opam
+%_bindir/opam-admin.top
+%_mandir/man*/*
 
-%files devel -f %{name}.files.devel
+%files devel -f %name.files.devel
 
 %files installer
-%{_bindir}/opam-installer
+%_bindir/opam-installer
 
 %changelog

++++++ _service ++++++
--- /var/tmp/diff_new_pack.OZEqcw/_old  2022-04-05 19:56:37.825446239 +0200
+++ /var/tmp/diff_new_pack.OZEqcw/_new  2022-04-05 19:56:37.829446194 +0200
@@ -1,7 +1,7 @@
 <services>
   <service mode="disabled" name="tar_scm">
     <param name="filename">opam</param>
-    <param name="revision">838b0179e2ce328f0d2e40a7eb5ea923b8915866</param>
+    <param name="revision">1388025221bf807ae9cfe5c5bb274d1edee6a3c2</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/ocaml/opam.git</param>

++++++ opam-2.1.1.tar.xz -> opam-2.1.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/.github/workflows/ci.yml 
new/opam-2.1.2/.github/workflows/ci.yml
--- old/opam-2.1.1/.github/workflows/ci.yml     2021-10-29 17:41:38.000000000 
+0200
+++ new/opam-2.1.2/.github/workflows/ci.yml     2021-12-07 17:09:27.000000000 
+0100
@@ -7,8 +7,8 @@
   OPAMBSROOT: ~/.cache/.opam.cached
   OPAM12CACHE: ~/.cache/opam1.2/cache
   # This should be identical to the value in appveyor.yml
-  OPAM_TEST_REPO_SHA: b02110b549a0b5275806ce27444fabac71093a0e
-  OPAM_REPO_SHA: 9355b17f9c22a2b44740e3fc5f25f24771929f26
+  OPAM_TEST_REPO_SHA: 38e8f54c584fa3cfe779890f7a56fe88ee38be78
+  OPAM_REPO_SHA: 38e8f54c584fa3cfe779890f7a56fe88ee38be78
   # Default ocaml version for some jobs
   OCAML_VERSION: 4.12.0
   ## variables for cache paths
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/CHANGES new/opam-2.1.2/CHANGES
--- old/opam-2.1.1/CHANGES      2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/CHANGES      2021-12-07 17:09:27.000000000 +0100
@@ -3,6 +3,11 @@
 are not marked). Those prefixed with "(+)" are new command/option (since
 2.1.0~alpha2).
 
+2.1.2:
+* Fallback on dnf if yum does not exist on RHEL-based systems [#4825 
@kit-ty-kate]
+* Use --no-depexts in CLI 2.0 mode [#4908 @dra27]
+* bootstrap: update ocaml version (fixes the compilation of opam with mingw) 
[#4927 @kit-ty-kate]
+
 2.1.1:
 * Fix typo in error message for opam var [#4786 @kit-ty-kate - fix #4785]
 * Run the sandbox check in the temporary directory [#4787 @dra27 - fix #4783]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/appveyor.yml new/opam-2.1.2/appveyor.yml
--- old/opam-2.1.1/appveyor.yml 2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/appveyor.yml 2021-12-07 17:09:27.000000000 +0100
@@ -12,8 +12,8 @@
     CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
     DEP_MODE: lib-ext
     # This should be identical to the value in .travis.yml
-    OPAM_REPO_SHA: b02110b549a0b5275806ce27444fabac71093a0e
-    OPAM_TEST_REPO_SHA: b02110b549a0b5275806ce27444fabac71093a0e
+    OPAM_REPO_SHA: 38e8f54c584fa3cfe779890f7a56fe88ee38be78
+    OPAM_TEST_REPO_SHA: 38e8f54c584fa3cfe779890f7a56fe88ee38be78
   matrix:
     - CYG_ROOT: cygwin
       CYG_ARCH: x86
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/configure new/opam-2.1.2/configure
--- old/opam-2.1.1/configure    2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/configure    2021-12-07 17:09:27.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for opam 2.1.1.
+# Generated by GNU Autoconf 2.69 for opam 2.1.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -579,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='2.1.1'
-PACKAGE_STRING='opam 2.1.1'
+PACKAGE_VERSION='2.1.2'
+PACKAGE_STRING='opam 2.1.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1310,7 +1310,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures opam 2.1.1 to adapt to many kinds of systems.
+\`configure' configures opam 2.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1372,7 +1372,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 2.1.1:";;
+     short | recursive ) echo "Configuration of opam 2.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1482,7 +1482,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 2.1.1
+opam configure 2.1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1820,7 +1820,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by opam $as_me 2.1.1, which was
+It was created by opam $as_me 2.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -6984,7 +6984,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by opam $as_me 2.1.1, which was
+This file was extended by opam $as_me 2.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7037,7 +7037,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-opam config.status 2.1.1
+opam config.status 2.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/configure.ac new/opam-2.1.2/configure.ac
--- old/opam-2.1.1/configure.ac 2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/configure.ac 2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces
-AC_INIT(opam,2.1.1)
+AC_INIT(opam,2.1.2)
 AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/master_changes.md 
new/opam-2.1.2/master_changes.md
--- old/opam-2.1.1/master_changes.md    2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/master_changes.md    2021-12-07 17:09:27.000000000 +0100
@@ -8,6 +8,9 @@
 
 ## Global CLI
   *
+  * Fix typo in error message for opam var [#4786 @kit-ty-kate - fix #4785]
+  * Add cli 2.2 handling [#4853 @rjbou]
+  * --no-depexts is the default in CLI 2.0 mode [#4908 @dra27]
 
 ## Plugins
   *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam-client.opam 
new/opam-2.1.2/opam-client.opam
--- old/opam-2.1.1/opam-client.opam     2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam-client.opam     2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Client library for opam 2.1"
 description: """
 Actions on the opam root, switches, installations, and front-end.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam-core.opam 
new/opam-2.1.2/opam-core.opam
--- old/opam-2.1.1/opam-core.opam       2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam-core.opam       2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Core library for opam 2.1"
 description: """
 Small standard library extensions, and generic system interaction modules used 
by opam.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam-devel.opam 
new/opam-2.1.2/opam-devel.opam
--- old/opam-2.1.1/opam-devel.opam      2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam-devel.opam      2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Bootstrapped development binary for opam 2.1"
 description: """
 This package compiles (bootstraps) opam. For consistency and safety of the 
installation, the binaries are not installed into the PATH, but into 
lib/opam-devel, from where the user can manually install them system-wide.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam-format.opam 
new/opam-2.1.2/opam-format.opam
--- old/opam-2.1.1/opam-format.opam     2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam-format.opam     2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Format library for opam 2.1"
 description: """
 Definition of opam datastructures and its file interface.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam-installer.opam 
new/opam-2.1.2/opam-installer.opam
--- old/opam-2.1.1/opam-installer.opam  2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam-installer.opam  2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Installation of files to a prefix, following opam conventions"
 description: """
 opam-installer is a small tool that can read *.install files, as defined by 
opam [1], and execute them to install or remove package files without going 
through opam.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam-repository.opam 
new/opam-2.1.2/opam-repository.opam
--- old/opam-2.1.1/opam-repository.opam 2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam-repository.opam 2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Repository library for opam 2.1"
 description: """
 This library includes repository and remote sources handling, including 
curl/wget, rsync, git, mercurial, darcs backends.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam-solver.opam 
new/opam-2.1.2/opam-solver.opam
--- old/opam-2.1.1/opam-solver.opam     2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam-solver.opam     2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Solver library for opam 2.1"
 description: """
 Solver and Cudf interaction. This library is based on the Cudf and Dose 
libraries, and handles calls to the external solver from opam.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam-state.opam 
new/opam-2.1.2/opam-state.opam
--- old/opam-2.1.1/opam-state.opam      2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam-state.opam      2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "State library for opam 2.1"
 description: """
 Handling of the ~/.opam hierarchy, repository and switch states.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/opam.opam new/opam-2.1.2/opam.opam
--- old/opam-2.1.1/opam.opam    2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/opam.opam    2021-12-07 17:09:27.000000000 +0100
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Meta-package for Dune"
 maintainer: "opam-de...@lists.ocaml.org"
 authors: [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/src/client/opamArg.ml 
new/opam-2.1.2/src/client/opamArg.ml
--- old/opam-2.1.1/src/client/opamArg.ml        2021-10-29 17:41:38.000000000 
+0200
+++ new/opam-2.1.2/src/client/opamArg.ml        2021-12-07 17:09:27.000000000 
+0100
@@ -600,7 +600,7 @@
     assume_depexts; no_depexts;
   }
 
-let apply_build_options b =
+let apply_build_options cli b =
   let open OpamStd.Option.Op in
   let flag f = if f then Some true else None in
   OpamRepositoryConfig.update
@@ -624,7 +624,7 @@
        OpamPackage.Name.Set.of_list)
     ?unlock_base:(flag b.unlock_base)
     ?locked:(if b.locked then Some (Some b.lock_suffix) else None)
-    ?no_depexts:(flag b.no_depexts)
+    ?no_depexts:(flag (b.no_depexts || OpamCLIVersion.Op.(cli @= cli2_0)))
     ();
   OpamClientConfig.update
     ?keep_build_dir:(flag b.keep_build_dir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/src/client/opamArg.mli 
new/opam-2.1.2/src/client/opamArg.mli
--- old/opam-2.1.1/src/client/opamArg.mli       2021-10-29 17:41:38.000000000 
+0200
+++ new/opam-2.1.2/src/client/opamArg.mli       2021-12-07 17:09:27.000000000 
+0100
@@ -191,7 +191,7 @@
 val subpath: OpamCLIVersion.Sourced.t -> string option Term.t
 
 (** Applly build options *)
-val apply_build_options: build_options -> unit
+val apply_build_options: OpamCLIVersion.Sourced.t -> build_options -> unit
 
 (** Lock options *)
 val locked: ?section:string -> OpamCLIVersion.Sourced.t -> bool Term.t
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/src/client/opamCommands.ml 
new/opam-2.1.2/src/client/opamCommands.ml
--- old/opam-2.1.1/src/client/opamCommands.ml   2021-10-29 17:41:38.000000000 
+0200
+++ new/opam-2.1.2/src/client/opamCommands.ml   2021-12-07 17:09:27.000000000 
+0100
@@ -311,7 +311,7 @@
       show_opamrc bypass_checks
       () =
     apply_global_options cli global_options;
-    apply_build_options build_options;
+    apply_build_options cli build_options;
     (* If show option is set, dump opamrc and exit *)
     if show_opamrc then
       (OpamFile.InitConfig.write_to_channel stdout @@
@@ -1615,7 +1615,7 @@
       restore destdir assume_built check recurse subpath depext_only
       download_only atoms_or_locals () =
     apply_global_options cli global_options;
-    apply_build_options build_options;
+    apply_build_options cli build_options;
     if atoms_or_locals = [] && not restore then
       `Error (true, "required argument PACKAGES is missing")
     else
@@ -1731,7 +1731,7 @@
   let remove global_options build_options autoremove force destdir recurse
       subpath atom_locs () =
     apply_global_options cli global_options;
-    apply_build_options build_options;
+    apply_build_options cli build_options;
     OpamGlobalState.with_ `Lock_none @@ fun gt ->
     match destdir with
     | Some d ->
@@ -1804,7 +1804,7 @@
   let reinstall global_options build_options assume_built recurse subpath
       atoms_locs cmd () =
     apply_global_options cli global_options;
-    apply_build_options build_options;
+    apply_build_options cli build_options;
     let open OpamPackage.Set.Op in
     OpamGlobalState.with_ `Lock_none @@ fun gt ->
     match cmd, atoms_locs with
@@ -1975,7 +1975,7 @@
   let upgrade global_options build_options fixup check only_installed all
       recurse subpath atom_locs () =
     apply_global_options cli global_options;
-    apply_build_options build_options;
+    apply_build_options cli build_options;
     let all = all || atom_locs = [] in
     OpamGlobalState.with_ `Lock_none @@ fun gt ->
     if fixup then
@@ -2553,7 +2553,7 @@
       OpamConsole.warning "Option %s is deprecated, ignoring it."
         (OpamConsole.colorise `bold "--no-autoinstall");
     apply_global_options cli global_options;
-    apply_build_options build_options;
+    apply_build_options cli build_options;
     let invariant_arg ?repos rt args =
       match args, packages, formula, empty with
       | [], None, None, false -> None
@@ -3107,7 +3107,7 @@
       with_version
       command params () =
     apply_global_options cli global_options;
-    apply_build_options build_options;
+    apply_build_options cli build_options;
     let locked = OpamStateConfig.(!r.locked) <> None in
     let action = not no_act in
     let get_command = function
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/src/state/opamSysInteract.ml 
new/opam-2.1.2/src/state/opamSysInteract.ml
--- old/opam-2.1.1/src/state/opamSysInteract.ml 2021-10-29 17:41:38.000000000 
+0200
+++ new/opam-2.1.2/src/state/opamSysInteract.ml 2021-12-07 17:09:27.000000000 
+0100
@@ -130,6 +130,14 @@
   ) in
   fun () -> Lazy.force family
 
+let yum_cmd = lazy begin
+  if OpamSystem.resolve_command "yum" <> None then
+    "yum"
+  else if OpamSystem.resolve_command "dnf" <> None then
+    "dnf"
+  else
+    raise (OpamSystem.Command_not_found "yum or dnf")
+end
 
 let packages_status packages =
   let (+++) pkg set = OpamSysPkg.Set.add (OpamSysPkg.of_string pkg) set in
@@ -635,11 +643,11 @@
     let epel_release = "epel-release" in
     let install_epel rest =
       if List.mem epel_release packages then
-        ["yum", "install"::yes ["-y"] [epel_release]] @ rest
+        [Lazy.force yum_cmd, "install"::yes ["-y"] [epel_release]] @ rest
       else rest
     in
     install_epel
-      ["yum", "install"::yes ["-y"]
+      [Lazy.force yum_cmd, "install"::yes ["-y"]
                 (OpamStd.String.Set.of_list packages
                  |> OpamStd.String.Set.remove epel_release
                  |> OpamStd.String.Set.elements);
@@ -704,7 +712,7 @@
     match family () with
     | Alpine -> Some ("apk", ["update"])
     | Arch -> Some ("pacman", ["-Sy"])
-    | Centos -> Some ("yum", ["makecache"])
+    | Centos -> Some (Lazy.force yum_cmd, ["makecache"])
     | Debian -> Some ("apt-get", ["update"])
     | Gentoo -> Some ("emerge", ["--sync"])
     | Homebrew -> Some ("brew", ["update"])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/opam-2.1.1/src_ext/Makefile 
new/opam-2.1.2/src_ext/Makefile
--- old/opam-2.1.1/src_ext/Makefile     2021-10-29 17:41:38.000000000 +0200
+++ new/opam-2.1.2/src_ext/Makefile     2021-12-07 17:09:27.000000000 +0100
@@ -11,8 +11,8 @@
 
 PATCH ?= patch
 
-URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0.tar.gz
-MD5_ocaml = 0863b31da0ab8ef67c5b723206f494da
+URL_ocaml = https://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.1.tar.gz
+MD5_ocaml = 4b494fe0f06af9f3ff5047fc26993e3f
 
 URL_flexdll = https://github.com/alainfrisch/flexdll/archive/0.39.tar.gz
 MD5_flexdll = c8493c7b6e95c4763b89213a9a710af5

Reply via email to