- tests fail with cvs-nserver-client; BC it

Changed files:
    git-core.spec -> 1.96

diff --git a/git-core.spec b/git-core.spec
index f1860e6ba51c7a1e897189ff6c646474330adee1..b7705b80819a1ce24903152c66b7301629c7efca 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -33,6 +33,8 @@ BuildRequires:        xmlto
 %endif
 %if %{with tests}
 BuildRequires: cvs
+# tests fail when using this client
+BuildConflicts:        cvs-nserver-client
 BuildRequires: pdksh >= 5.2.14-46
 %endif
 Requires:      coreutils