From e3b9ea17717e8bff9c6ffa33e14dc93bb2e50cd36107aa7eeef93e18d33e65f9 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 28 Jan 2013 13:19:19 +0000 Subject: [PATCH] Accepting request 150128 from home:msmeissn:branches:server:database - require the errormessage rpm in libmysqld too for embedded usage like in AmaRoK. OBS-URL: https://build.opensuse.org/request/show/150128 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=104 --- mariadb.changes | 6 ++++++ mariadb.spec | 30 ++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/mariadb.changes b/mariadb.changes index 96438de..355cd44 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 28 09:28:44 UTC 2013 - meissner@suse.com + +- require the errormessage rpm in libmysqld too + for embedded usage like in AmaRoK. + ------------------------------------------------------------------- Thu Jan 17 09:14:41 CET 2013 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index f894cce..33a9dd3 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -36,7 +36,7 @@ Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Version: 5.5.28a -Release: 1 +Release: 0 %define srv_vers 5.5.28 Url: http://www.mariab.org Source: mariadb-%{version}.tar.bz2 @@ -83,10 +83,11 @@ Recommends: logrotate Requires: logrotate %endif # required by rcmysql -Requires: %{name}-client perl-base +Requires: %{name}-client Requires: %{name}-errormessages = %version -Provides: mysql-Max = %{srv_vers} +Requires: perl-base Provides: mysql = %{srv_vers} +Provides: mysql-Max = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides} = %{version} Obsoletes: %{extra_provides} < %{version} @@ -110,13 +111,12 @@ This package only contains the server-side programs. # mysql-devel was last used in openSUSE 10.2 Provides: mysql-devel = %srv_vers-%release Obsoletes: mysql-devel < %srv_vers +Requires: glibc-devel Requires: libmysqlclient18 = %version Requires: libmysqlclient_r18 = %version -Requires: glibc-devel Requires: openssl-devel Requires: zlib-devel Summary: MariaDB development header files and libraries -License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/C and C++ %description -n libmysqlclient-devel @@ -124,22 +124,21 @@ This package contains the development header files and libraries necessary to develop client applications for MariaDB. %package -n libmysqld18 -License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ +Requires: %{name}-errormessages = %version %description -n libmysqld18 This package contains the development header files and libraries for developing applications that embed the MariaDB. %package -n libmysqld-devel -License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files +Group: Development/Libraries/C and C++ # the headers files are the shared Requires: libmysqlclient-devel = %version -Requires: tcpd-devel Requires: libmysqld18 = %version -Group: Development/Libraries/C and C++ +Requires: tcpd-devel %description -n libmysqld-devel This package contains the development header files and libraries @@ -148,7 +147,6 @@ for developing applications that embed the MariaDB. %package -n libmysqlclient18 Summary: Shared Libraries for MariaDB -License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmysqlclient18 @@ -157,7 +155,6 @@ languages and applications need to dynamically load and use MariaDB. %package -n libmysqlclient_r18 Summary: Shared Libraries for MariaDB -License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmysqlclient_r18 @@ -190,7 +187,8 @@ This package provides the translated error messages for the standalone server daemon as well as the embedded server %package bench -Requires: %{name}-client perl-DBD-mysql +Requires: %{name}-client +Requires: perl-DBD-mysql Summary: Benchmarks for MariaDB Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} @@ -214,8 +212,8 @@ the directory /usr/share/sql-bench after starting MariaDB. Summary: MariaDB with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{version} -Provides: mysql-debug = %{srv_vers} Provides: %{name}-debug = %{srv_vers} +Provides: mysql-debug = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-debug-verion = %{version} Obsoletes: %{extra_provides}-debug-version < %{version} @@ -236,10 +234,10 @@ information on how to use the debug server. Summary: Testsuite for MariaDB Group: Productivity/Databases/Servers Requires: %{name} = %{version} -Requires: %{name}-client = %{version} -Requires: perl-DBD-mysql -Requires: %{name}-tools = %{version} Requires: %{name}-bench = %{version} +Requires: %{name}-client = %{version} +Requires: %{name}-tools = %{version} +Requires: perl-DBD-mysql Provides: mysql-test = %{srv_vers} %if 0%{?use_extra_provides} > 0 Provides: %{extra_provides}-test = %{version}