From e4fafd50cdba839748db04904c8d124eadaf58c9 Mon Sep 17 00:00:00 2001
From: tzing_t <zhengting13@huawei.com>
Date: Mon, 6 Nov 2023 08:48:24 +0000
Subject: [PATCH] Change Obsoletes to Conflicts

---
 openstack-tempest.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/openstack-tempest.spec b/openstack-tempest.spec
index 7bc8685..634a2d6 100644
--- a/openstack-tempest.spec
+++ b/openstack-tempest.spec
@@ -8,7 +8,7 @@ other specific tests useful in validating an OpenStack deployment.
 
 Name:           openstack-%{project}
 Version:        22.1.0
-Release:        1
+Release:        2
 Summary:        OpenStack Integration Test Suite (Tempest)
 License:        ASL 2.0
 Url:            https://launchpad.net/tempest
@@ -38,7 +38,7 @@ Summary:       Tempest Python library
 # Obsoletes python-tempest-lib to avoid breakage
 # during upgrade from Newton onwards to till this
 # release
-Obsoletes:     python-tempest-lib
+Conflicts:     python-tempest-lib
 
 Requires:      python3-cliff >= 2.8.0
 Requires:      python3-debtcollector >= 1.2.0
@@ -187,6 +187,9 @@ PYTHON=%{__python3} stestr --test-path $OS_TEST_PATH run
 %endif
 
 %changelog
+* Mon Nov 06 2023 zhengting <zhengting13@huawei.com> - 22.1.0-2
+* Change Obsoletes to Conflicts
+
 * Mon Nov 15 2021 liusheng <liusheng2048@gmail.com> - 22.1.0-1
 - Upgrade tempest package to version 22.1.0
 
-- 
Gitee