From a19426c2aa7066adfba15f56f6e42ca55dc8b4871a7a745b4539c6acb666e162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Thu, 15 Sep 2022 07:01:54 +0000
Subject: [PATCH] Accepting request 1003705 from GNOME:Next

- Add provides/conflicts to the sub packages to co-exist with gcr:
  + gcr3-data provides gcr-data and conflicts with gcr-data:
    packages provided by gcr and gcr3 will thus be picked from gcr
    (higher version)
  + Same setup done for gcr3-viewew, -prompter, -ssh-askpass, and
    -ssh-agent.

OBS-URL: https://build.opensuse.org/request/show/1003705
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gcr3?expand=0&rev=2
---
 gcr3.changes | 10 ++++++++++
 gcr3.spec    | 19 ++++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/gcr3.changes b/gcr3.changes
index 899fc19..b7cfd23 100644
--- a/gcr3.changes
+++ b/gcr3.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep 15 06:50:28 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add provides/conflicts to the sub packages to co-exist with gcr:
+  + gcr3-data provides gcr-data and conflicts with gcr-data:
+    packages provided by gcr and gcr3 will thus be picked from gcr
+    (higher version)
+  + Same setup done for gcr3-viewew, -prompter, -ssh-askpass, and
+    -ssh-agent.
+
 -------------------------------------------------------------------
 Fri Aug  5 08:06:40 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/gcr3.spec b/gcr3.spec
index 328174d..3cd30d9 100644
--- a/gcr3.spec
+++ b/gcr3.spec
@@ -70,6 +70,8 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 %package viewer
 Summary:        Viewer for Crypto Files
 Group:          Productivity/Security
+Provides:       %{_name}-viewer = %{version}
+Conflicts:      %{_name}-viewer
 
 %description viewer
 This packages provides the viewer for crypto files on the GNOME desktop.
@@ -77,6 +79,9 @@ This packages provides the viewer for crypto files on the GNOME desktop.
 %package data
 Summary:        Data and icon set for gcr
 Group:          System/Libraries
+Provides:       %{_name}-data = %{version}
+Obsoletes:      %{_name}-data <= %{version}
+Conflicts:      %{_name}-data
 
 %description data
 This package provides the GSettings schemas and a collection of icons
@@ -85,6 +90,9 @@ needed by libgcr.
 %package prompter
 Summary:        Prompt dialog for gcr
 Group:          System/Libraries
+Provides:       %{_name}-prompter = %{version}
+Obsoletes:      %{_name}-prompter <= %{version}
+Conflicts:      %{_name}-prompter
 
 %description prompter
 This package provides the prompt dialog needed by libgcr.
@@ -92,6 +100,9 @@ This package provides the prompt dialog needed by libgcr.
 %package ssh-askpass
 Summary:        SSH password callback helper for gcr
 Group:          System/Libraries
+Provides:       %{_name}-ssh-askpass = %{version}
+Obsoletes:      %{_name}-ssh-askpass <= %{version}
+Conflicts:      %{_name}-ssh-askpass
 Supplements:    (gpg2 and gnome-shell)
 
 %description ssh-askpass
@@ -100,7 +111,9 @@ gcr-ssh-askpass allows an ssh command to callback for a password.
 %package ssh-agent
 Summary:        SSH agent binary for gcr
 Group:          System/Libraries
-Conflicts:      gcr-ssh-agent
+Provides:       %{_name}-ssh-agent = %{version}
+Obsoletes:      %{_name}-ssh-agent <= %{version}
+Conflicts:      %{_name}-ssh-agent
 Supplements:    (gpg2 and gnome-shell)
 
 %description ssh-agent
@@ -112,9 +125,9 @@ Summary:        Library for Crypto UI related tasks
 Group:          System/Libraries
 Requires:       %{_name}-data >= %{version}
 Requires:       %{_name}-prompter >= %{version}
-Recommends:     %{_name}-ask-pass
+Recommends:     %{_name}-ssh-agent
+Recommends:     %{_name}-ssh-askpass
 Recommends:     %{_name}-viewer = %{version}
-Recommends:     gcr-ssh-agent
 # To make lang package installable
 Provides:       %{name} = %{version}