- back to Obsoletes for client:

  - Conflicts disallows to replace cvs-nserver-client using poldek
  - nserver client is no longer supported by cvs.pld-linux.org
    (>= 1.11 is required to move or remove branch tag)

Changed files:
    cvs.spec -> 1.181

diff --git a/cvs.spec b/cvs.spec
index 13568a3907e2d59e5d75ff39bd26abdd3a4cf438..9ef08a7e74ad40346e436e1ea9753a9a8a64a453 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -28,7 +28,7 @@ Patch5:               %{name}-posix.patch
 Patch6:                %{name}-CAN_2005_2693.patch
 Patch7:                %{name}-cvspass.patch
 Patch8:                %{name}-datetime.patch
-Patch9 :       %{name}-getcwd.patch
+Patch9:                %{name}-getcwd.patch
 
 # patches from debian
 Patch100:      %{name}-debian-64bit-crash.patch
@@ -62,7 +62,7 @@ BuildRequires:        automake >= 1:1.7.9
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: texinfo
 BuildRequires: zlib-devel
-Conflicts:     cvs-nserver-client
+Obsoletes:     cvs-nserver-client
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _cvs_root       /var/lib/cvs