From 226f89f2dc82b8f893373fc7e6b22661115c52cc794e9b89c87ba05e4aac3068 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Thu, 26 May 2022 16:43:44 +0000
Subject: [PATCH] Accepting request 979048 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/979048
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=279
---
 git.changes | 7 +++++++
 git.spec    | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/git.changes b/git.changes
index 6b78988..e6259cb 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 24 11:48:21 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Do not recommend git-cvs and git-svn by git, but rather have
+  those two packages supplement the combination of git and their
+  respective counterparts.
+
 -------------------------------------------------------------------
 Fri May  6 18:27:27 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/git.spec b/git.spec
index 961ae8a..20c865f 100644
--- a/git.spec
+++ b/git.spec
@@ -80,9 +80,7 @@ BuildRequires:  xz
 BuildRequires:  zlib-devel
 Requires:       git-core = %{version}
 Requires:       perl-Git = %{version}
-Recommends:     git-cvs
 Recommends:     git-email
-Recommends:     git-svn
 Suggests:       git-gui
 Suggests:       gitk
 Suggests:       git-daemon
@@ -175,6 +173,7 @@ Requires:       perl-Git = %{version}
 Requires:       perl-Term-ReadKey
 Requires:       subversion
 Requires:       subversion-perl
+Supplements:    (%{name} and subversion)
 
 %description svn
 Tools for importing Subversion repositories to the Git version control
@@ -188,6 +187,7 @@ Requires:       cvsps
 Requires:       git-core = %{version}
 Requires:       perl-DBD-SQLite
 Requires:       perl-Git = %{version}
+Supplements:    (%{name} and cvs)
 
 %description cvs
 Tools for importing CVS repositories to the Git version control system.