SPECS: cvs.spec - back to Obsoletes for client: - Conflicts disa...

[qboosh]

Author: qboosh                       Date: Sat Dec  1 23:14:15 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 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)

---- Files affected:
SPECS:
   cvs.spec (1.180 -> 1.181) 

---- Diffs:

================================================================
Index: SPECS/cvs.spec
diff -u SPECS/cvs.spec:1.180 SPECS/cvs.spec:1.181
--- SPECS/cvs.spec:1.180	Sun Nov 11 22:35:20 2007
+++ SPECS/cvs.spec	Sun Dec  2 00:14:10 2007
@@ -29,7 +29,7 @@
 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
@@ -63,7 +63,7 @@
 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
@@ -344,6 +344,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.181  2007-12-01 23:14:10  qboosh
+- 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)
+
 Revision 1.180  2007-11-11 21:35:20  blues
 - rel.6 - newnline patch is obsoleted by debian-newlines-commit-template
   patch (avoid 2 new lines in commit message); rename kerberos5 bcond to
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cvs.spec?r1=1.180&r2=1.181&f=u