From 321f5bda13dcdf8d4d0815d125e6afb8ac7d3a55165872224d9be7879a24f4b6 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Wed, 27 Jul 2011 11:56:09 +0000 Subject: [PATCH] - requiring %{version} and not %{srv_vers} - dependencies are resolvable now OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=47 --- mariadb.changes | 6 ++++++ mariadb.spec | 18 +++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/mariadb.changes b/mariadb.changes index eb4ef04..78dc1f5 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 27 13:51:14 CEST 2011 - mhrusecky@suse.cz + +- requiring %{version} and not %{srv_vers} + - dependencies are resolvable now + ------------------------------------------------------------------- Sat Jul 16 23:14:42 UTC 2011 - crrodriguez@opensuse.org diff --git a/mariadb.spec b/mariadb.spec index 2d318d1..d9d223b 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -129,7 +129,7 @@ Authors: #------------------------------------------------------------------------------- # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release -Requires: libmysqlclient16 = %srv_vers libmysqlclient_r16 = %srv_vers glibc-devel zlib-devel openssl-devel +Requires: libmysqlclient16 = %{version} libmysqlclient_r16 = %{version} glibc-devel zlib-devel openssl-devel Summary: MariaDB Development Header Files and Libraries License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Group: Development/Libraries/C and C++ @@ -149,7 +149,7 @@ Authors: License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB embedded server development files # the headers files are the shared -Requires: libmysqlclient-devel = %srv_vers +Requires: libmysqlclient-devel = %{version} Group: Development/Libraries/C and C++ %description -n libmysqld0 @@ -163,8 +163,8 @@ for developing application that embed the MariaDB server License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB embedded server development files # the headers files are the shared -Requires: libmysqlclient-devel = %srv_vers -Requires: libmysqld0 = %srv_vers +Requires: libmysqlclient-devel = %{version} +Requires: libmysqld0 = %{version} Group: Development/Libraries/C and C++ %description -n libmysqld-devel @@ -255,7 +255,7 @@ Authors: License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB server with debug options turned on Group: Productivity/Databases/Servers -Requires: %{name} = %{srv_vers} +Requires: %{name} = %{version} Provides: mysql-debug = %{srv_vers} Conflicts: otherproviders(mysql-debug) @@ -282,11 +282,11 @@ Authors: License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT Summary: MariaDB testsuite Group: Productivity/Databases/Servers -Requires: %{name} = %{srv_vers} -Requires: %{name}-client = %{srv_vers} +Requires: %{name} = %{version} +Requires: %{name}-client = %{version} Requires: perl-DBD-mysql -Requires: %{name}-tools = %{srv_vers} -Requires: %{name}-bench = %{srv_vers} +Requires: %{name}-tools = %{version} +Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} Conflicts: otherproviders(mysql-test)