From 373bae24eec34560141efaa7158629e84e162d314403ca118ded7306825d993e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sun, 28 Jan 2024 16:46:12 +0000
Subject: [PATCH] - add conflicts with libs3-tools - from version 0.1.45

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/aws-c-s3?expand=0&rev=38
---
 aws-c-s3.changes | 7 ++++++-
 aws-c-s3.spec    | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/aws-c-s3.changes b/aws-c-s3.changes
index 63dc302..3884bc4 100644
--- a/aws-c-s3.changes
+++ b/aws-c-s3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jan 28 16:45:47 UTC 2024 - Dirk Müller <dmueller@suse.com>
+
+- add conflicts with libs3-tools
+
 -------------------------------------------------------------------
 Fri Jan 26 12:09:44 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 
@@ -320,7 +325,7 @@ Fri Sep  2 07:07:33 UTC 2022 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.c
 
 - Update to version 0.1.46
   * Fallback for target load by @TingDaoK in (c1198ae)
-- from version 0.1.45  
+- from version 0.1.45
   * Add checksum to s3 dependencies by @sbSteveK in (#199)
   * Use aws_byte_cursor_utf8_parse_u64 by @TingDaoK in (#200)
 
diff --git a/aws-c-s3.spec b/aws-c-s3.spec
index 1522394..32200a1 100644
--- a/aws-c-s3.spec
+++ b/aws-c-s3.spec
@@ -49,6 +49,8 @@ AWS Crypto Abstraction Layer: Cross-Platform, C99 wrapper for cryptography primi
 %package -n %{name}-bin
 Summary:        aws-c-s3 binary files
 Group:          Development/Libraries/C and C++
+# both provide /usr/bin/s3
+Conflicts:      libs3-tools
 
 %description -n %{name}-bin
 AWS Crypto Abstraction Layer: Cross-Platform, C99 wrapper for cryptography primitives.