packages: libiodbc/libiodbc.spec - rel 2; conflicts with unixodbc

[arekm]

Author: arekm                        Date: Fri Jan  8 09:14:15 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; conflicts with unixodbc

---- Files affected:
packages/libiodbc:
   libiodbc.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: packages/libiodbc/libiodbc.spec
diff -u packages/libiodbc/libiodbc.spec:1.36 packages/libiodbc/libiodbc.spec:1.37
--- packages/libiodbc/libiodbc.spec:1.36	Sat Oct 31 10:31:00 2009
+++ packages/libiodbc/libiodbc.spec	Fri Jan  8 10:14:09 2010
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	Zarządca sterowników iODBC
 Name:		libiodbc
 Version:	3.52.7
-Release:	1
+Release:	2
 License:	LGPL v2 or BSD
 Group:		Libraries
 Source0:	http://www.iodbc.org/downloads/iODBC/%{name}-%{version}.tar.gz
@@ -20,6 +20,7 @@
 BuildRequires:	gtk+2-devel >= 1:2.0.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
+Conflicts:	unixODBC
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -45,6 +46,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe do rozwoju aplikacji na iODBC
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Conflicts:	unixODBC-devel
 
 %description devel
 The iODBC Driver Manager is a free implementation of the SAG CLI and
@@ -69,6 +71,7 @@
 Summary(pl.UTF-8):	Statyczna wersja bibliotek iODBC
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Conflicts:	unixODBC-static
 
 %description static
 Static version of iODBC libraries.
@@ -176,6 +179,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2010/01/08 09:14:09  arekm
+- rel 2; conflicts with unixodbc
+
 Revision 1.36  2009/10/31 09:31:00  cactus
 - up to 3.52.7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libiodbc/libiodbc.spec?r1=1.36&r2=1.37&f=u