Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/adcli.git#a4c60255effe7b3fd6275b78a392161ad523d2bf

adcli.spec

@@ -1,6 +1,6 @@
 Name:    adcli
 Version: 0.9.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Active Directory enrollment
 License: LGPLv2+
 URL:     https://gitlab.freedesktop.org/realmd/adcli
@@ -17,6 +17,7 @@ BuildRequires: xmlto
 BuildRequires: make
 
 Requires: cyrus-sasl-gssapi
+Conflicts: adcli-doc < %{version}-%{release}
 
 # adcli no longer has a library of development files
 # the adcli tool itself is to be used by callers
@@ -53,6 +54,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %package doc
 Summary: adcli documentation
 BuildArch: noarch
+Conflicts: adcli < %{version}-%{release}
 
 %description doc
 adcli is a tool for joining an Active Directory domain using
@@ -63,6 +65,9 @@ documentation.
 %doc %{_datadir}/doc/adcli/*
 
 %changelog
+* Sat Feb 20 2021 Sumit Bose <sbose@redhat.com> - 0.9.1-2
+- Add Conflicts to avoid update/downgrade issues
+
 * Sat Feb 20 2021 Sumit Bose <sbose@redhat.com> - 0.9.1-1
 - Update to upstream release 0.9.1