Merge pull request #4921 from rjbou/212

Bump to 2.1.2
ocaml · Dec 7, 2021 · 1388025 · 1388025
2 parents b3fdd6c + c555c6d
commit 1388025
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 19 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,11 @@ repositories (changes that are automatically handled by the format upgrade tools
 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 --git a/configure b/configure
diff --git a/configure.ac b/configure.ac
@@ -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 --git a/opam-client.opam b/opam-client.opam
@@ -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 --git a/opam-core.opam b/opam-core.opam
@@ -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 --git a/opam-devel.opam b/opam-devel.opam
@@ -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 --git a/opam-format.opam b/opam-format.opam
@@ -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 --git a/opam-installer.opam b/opam-installer.opam
@@ -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 --git a/opam-repository.opam b/opam-repository.opam
@@ -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 --git a/opam-solver.opam b/opam-solver.opam
@@ -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 --git a/opam-state.opam b/opam-state.opam
@@ -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 --git a/opam.opam b/opam.opam
@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "2.1.1"
+version: "2.1.2"
 synopsis: "Meta-package for Dune"
 maintainer: "opam-devel@lists.ocaml.org"
 authors: [