SPECS (AC-branch): rpm.spec - rpm must have conflicts < poldek, an...

[glen]

Author: glen                         Date: Thu Feb 14 13:07:29 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rpm must have conflicts < poldek, and poldek must bave requires > rpm for upgrade to work; rel 36

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.6 -> 1.837.2.42.2.7) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.6 SPECS/rpm.spec:1.837.2.42.2.7
--- SPECS/rpm.spec:1.837.2.42.2.6	Thu Feb 14 09:40:34 2008
+++ SPECS/rpm.spec	Thu Feb 14 14:07:24 2008
@@ -37,7 +37,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	35
+Release:	36
 License:	LGPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -182,8 +182,7 @@
 Obsoletes:	rpm-getdeps
 %{!?with_static:Obsoletes:	rpm-utils-static}
 Conflicts:	glibc < 2.2.92
-# poldek with version dep on rpm needed
-Conflicts:	poldek < 0.20-21
+Conflicts:	poldek < 0.21-0.20070703.00.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_binary_payload		w9.gzdio
@@ -1272,6 +1271,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.7  2008-02-14 13:07:24  glen
+- rpm must have conflicts < poldek, and poldek must bave requires > rpm for upgrade to work; rel 36
+
 Revision 1.837.2.42.2.6  2008-02-14 08:40:34  glen
 - don't compress gpg key
 
================================================================

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