[trytond] - drop the conflicts between db backends, they can co-exist

[Dan Horák]

commit 865799d4513622e15982e07df532d6adb9b72e3f
Author: Dan Horák <dan at danny.cz>
Date:   Thu Nov 18 09:46:55 2010 +0100

    - drop the conflicts between db backends, they can co-exist

 trytond.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/trytond.spec b/trytond.spec
index 1b3df8c..cfea1f3 100644
--- a/trytond.spec
+++ b/trytond.spec
@@ -2,15 +2,17 @@
 
 %{!?_initddir: %define _initddir %{_initrddir}}
 
+%global major 1.8
+
 Name:           trytond
 Version:        1.8.1
-Release:        1%{?dist}.1
+Release:        2%{?dist}
 Summary:        Server for the Tryton application framework
 
 Group:          System Environment/Daemons
 License:        GPLv3+
 URL:            http://www.tryton.org
-Source0:        http://downloads.tryton.org/1.6/%{name}-%{version}.tar.gz
+Source0:        http://downloads.tryton.org/%{major}/%{name}-%{version}.tar.gz
 Source10:       %{name}.init
 Source11:       %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -34,7 +36,7 @@ Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
 
-Provides:       tryton(kernel) = 1.8
+Provides:       tryton(kernel) = %{major}
 
 
 %description
@@ -80,8 +82,6 @@ Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Provides:       %{name}-server = %{version}-%{release}
 Requires:       MySQL-python
-Conflicts:      %{name}-pgsql
-Conflicts:      %{name}-sqlite
 
 %description mysql
 MySQL support for Tryton Server.
@@ -93,8 +93,6 @@ Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Provides:       %{name}-server = %{version}-%{release}
 Requires:       python-psycopg2
-Conflicts:      %{name}-mysql
-Conflicts:      %{name}-sqlite
 
 %description pgsql
 PostgreSQL support for Tryton Server.
@@ -106,8 +104,6 @@ Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 Provides:       %{name}-server = %{version}-%{release}
 Requires:       python-sqlite2
-Conflicts:      %{name}-mysql
-Conflicts:      %{name}-pgsql
 
 %description sqlite
 SQLite support for Tryton Server.
@@ -206,6 +202,9 @@ fi
 
 
 %changelog
+* Wed Nov 17 2010 Dan Horák <dan[at]danny.cz> 1.8.1-2
+- drop the conflicts between db backends, they can co-exist
+
 * Tue Nov 16 2010 Dan Horák <dan[at]danny.cz> 1.8.1-1.1
 - fix the tryton(kernel) Provides: