packages: python-psycopg2/python-psycopg2.spec - fixed build conflicts for ...

[wrobell]

Author: wrobell                      Date: Wed Jul 15 12:36:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build conflicts for mx DateTime module obligatory requirement
- rel. 3

---- Files affected:
packages/python-psycopg2:
   python-psycopg2.spec (1.70 -> 1.71) 

---- Diffs:

================================================================
Index: packages/python-psycopg2/python-psycopg2.spec
diff -u packages/python-psycopg2/python-psycopg2.spec:1.70 packages/python-psycopg2/python-psycopg2.spec:1.71
--- packages/python-psycopg2/python-psycopg2.spec:1.70	Fri Jul 10 07:58:32 2009
+++ packages/python-psycopg2/python-psycopg2.spec	Wed Jul 15 14:36:10 2009
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	psycopg jest przeznaczonym dla Pythona interfejsem do bazy PostgreSQL
 Name:		python-%{module}
 Version:	2.0.11
-Release:	2
+Release:	3
 License:	GPL
 Group:		Libraries/Python
 Source0:	http://initd.org/pub/software/psycopg/%{module}-%{version}.tar.gz
@@ -23,10 +23,10 @@
 BuildRequires:	rpm-pythonprov
 Requires:	postgresql-libs
 Requires:	python-modules
-# %if "%{pld_release}" == "ac"
+%if "%{pld_release}" == "ac"
 BuildRequires:	python-mx-DateTime-devel
 Requires:	python-mx-DateTime
-# %else
+%else
 # if somebody really needs mx.DateTime, then one can request mx.Datetime
 # usage on runtime;
 # it is pointless to use 'Requires' or 'Suggest' field because
@@ -34,8 +34,8 @@
 # - one can request it on runtime (as said above)
 # - usage of mx.DateTime type is application specific
 # Sure, but make mx-DateTime conditional build work
-# # BuildConflicts:   python-mx-DateTime
-# %endif
+BuildConflicts:   python-egenix-mx-base
+%endif
 Requires:	python-pytz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -88,6 +88,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71  2009/07/15 12:36:10  wrobell
+- fixed build conflicts for mx DateTime module obligatory requirement
+- rel. 3
+
 Revision 1.70  2009/07/10 05:58:32  matkor
 - Release 2.
   Disabled again nonworking (in Th) conditional build with python-mx-DateTime
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-psycopg2/python-psycopg2.spec?r1=1.70&r2=1.71&f=u