- common subpackage don't obsoletes cvs

[packages/cvs-nserver.git] / cvs-nserver.spec

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index 57d979e637b6d9d7ce488540fc741c98614203eb..b12692952d62aec40f5bc9f92a2cb4d000379d0c 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -5,7 +5,7 @@ Summary(pl):    Concurrent Versions System - nserver
 Summary(tr):   Sürüm denetim sistemi - nserver
 Name:          cvs-nserver
 Version:       1.11.1.52
-Release:       1
+Release:       2
 License:       GPL
 Group:         Development/Version Control
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -17,6 +17,7 @@ Patch2:               %{name}-am_ac.patch
 Patch3:                %{name}-cvspass.patch
 Patch4:                %{name}-home_etc.patch
 Patch5:                %{name}-ssl-link.patch
+Patch5:                %{name}-fix_doc_CVSUSER.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: openssl-devel >= 0.9.7
@@ -91,7 +92,7 @@ Summary(pl):  Concurrent Versions System - klient
 Group:         Development/Version Control
 Obsoletes:     cvs-npclient
 Obsoletes:     cvs
-Provides:      cvs = 1.11
+Provides:      cvs = %{version}
 
 %description client
 CVS client.
@@ -113,7 +114,6 @@ Requires(postun):   /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
 Requires:      cvs-nserver-client
 Obsoletes:     cvs-nserver
-Obsoletes:     cvs
 
 %description common
 CVS - common server files.
@@ -128,7 +128,7 @@ Group:              Development/Version Control
 PreReq:                rc-inetd
 Requires:      cvs-nserver-common
 Obsoletes:     cvs-npserver
-Obsoletes:     css-pserver
+Obsoletes:     cvs-pserver
 
 %description pserver
 CVS server - pserver files.
@@ -158,6 +158,7 @@ Serwer CVS - pliki nservera.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__aclocal}