SPECS: python.spec - unified

[qboosh]

Author: qboosh                       Date: Mon Oct 20 17:33:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   python.spec (1.331 -> 1.332) 

---- Diffs:

================================================================
Index: SPECS/python.spec
diff -u SPECS/python.spec:1.331 SPECS/python.spec:1.332
--- SPECS/python.spec:1.331	Sun Oct 19 01:25:25 2008
+++ SPECS/python.spec	Mon Oct 20 19:33:44 2008
@@ -80,9 +80,9 @@
 %{?with_tkinter:BuildRequires:	tix-devel >= 1:8.1.4-4}
 %{?with_tkinter:BuildRequires:	tk-devel >= 8.4.3}
 BuildRequires:	zlib-devel
-Conflicts:	bzr < 1.8
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Obsoletes:	python2
+Conflicts:	bzr < 1.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with verbose_tests}
@@ -945,6 +945,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.332  2008/10/20 17:33:44  qboosh
+- unified
+
 Revision 1.331  2008/10/18 23:25:25  matkor
 - Rel 4. Conflicts:    bzr < 1.8
 
================================================================

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