Author: patrys Date: Mon Oct 29 15:37:20 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - Conflicts instead of Obsoletes
---- Files affected: SPECS: cvs-nserver.spec (1.96 -> 1.97) , cvs.spec (1.172 -> 1.173) ---- Diffs: ================================================================ Index: SPECS/cvs-nserver.spec diff -u SPECS/cvs-nserver.spec:1.96 SPECS/cvs-nserver.spec:1.97 --- SPECS/cvs-nserver.spec:1.96 Tue Oct 9 17:31:11 2007 +++ SPECS/cvs-nserver.spec Mon Oct 29 16:37:15 2007 @@ -10,7 +10,7 @@ Summary(tr.UTF-8): Sürüm denetim sistemi - nserver Name: cvs-nserver Version: 1.11.1.52 -Release: 22 +Release: 23 License: GPL Group: Development/Version Control Source0: http://dl.sourceforge.net/cvs-nserver/%{name}-%{version}.tar.gz @@ -114,7 +114,7 @@ Summary(pl.UTF-8): Concurrent Versions System - klient Group: Development/Version Control Provides: cvs = %{version} -Obsoletes: cvs +Conflicts: cvs Obsoletes: cvs-npclient %description client @@ -343,6 +343,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.97 2007/10/29 15:37:15 patrys +- Conflicts instead of Obsoletes + Revision 1.96 2007/10/09 15:31:11 baggins - s/enviroment/environment/ ================================================================ Index: SPECS/cvs.spec diff -u SPECS/cvs.spec:1.172 SPECS/cvs.spec:1.173 --- SPECS/cvs.spec:1.172 Sun Apr 1 01:38:57 2007 +++ SPECS/cvs.spec Mon Oct 29 16:37:15 2007 @@ -15,7 +15,7 @@ Summary(zh_CN.UTF-8): 并发的版本管理系统CVS Name: cvs Version: 1.11.22 -Release: 1 +Release: 2 License: GPL Group: Development/Version Control # new: ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2 @@ -40,7 +40,7 @@ BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: texinfo BuildRequires: zlib-devel -Obsoletes: cvs-nserver-client +Conflicts: cvs-nserver-client BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _cvs_root /var/lib/cvs @@ -289,6 +289,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.173 2007/10/29 15:37:15 patrys +- Conflicts instead of Obsoletes + Revision 1.172 2007/03/31 23:38:57 arekm - up to 1.11.22 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cvs-nserver.spec?r1=1.96&r2=1.97&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cvs.spec?r1=1.172&r2=1.173&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
