Accepting request 150486 from server:database

bnc#712749 happens again on Factory after the switch to of MySQL libraires to MariaDB

See http://lists.opensuse.org/opensuse-factory/2013-01/msg00544.html for more context

OBS-URL: https://build.opensuse.org/request/show/150486
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2013-01-31 15:46:44 +00:00 committed by Git OBS Bridge
commit ac22b3701c
2 changed files with 20 additions and 16 deletions

View File

@ -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 Thu Jan 17 09:14:41 CET 2013 - mhrusecky@suse.cz

View File

@ -36,7 +36,7 @@ Summary: Server part of MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Version: 5.5.28a Version: 5.5.28a
Release: 1 Release: 0
%define srv_vers 5.5.28 %define srv_vers 5.5.28
Url: http://www.mariab.org Url: http://www.mariab.org
Source: mariadb-%{version}.tar.bz2 Source: mariadb-%{version}.tar.bz2
@ -83,10 +83,11 @@ Recommends: logrotate
Requires: logrotate Requires: logrotate
%endif %endif
# required by rcmysql # required by rcmysql
Requires: %{name}-client perl-base Requires: %{name}-client
Requires: %{name}-errormessages = %version Requires: %{name}-errormessages = %version
Provides: mysql-Max = %{srv_vers} Requires: perl-base
Provides: mysql = %{srv_vers} Provides: mysql = %{srv_vers}
Provides: mysql-Max = %{srv_vers}
%if 0%{?use_extra_provides} > 0 %if 0%{?use_extra_provides} > 0
Provides: %{extra_provides} = %{version} Provides: %{extra_provides} = %{version}
Obsoletes: %{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 # mysql-devel was last used in openSUSE 10.2
Provides: mysql-devel = %srv_vers-%release Provides: mysql-devel = %srv_vers-%release
Obsoletes: mysql-devel < %srv_vers Obsoletes: mysql-devel < %srv_vers
Requires: glibc-devel
Requires: libmysqlclient18 = %version Requires: libmysqlclient18 = %version
Requires: libmysqlclient_r18 = %version Requires: libmysqlclient_r18 = %version
Requires: glibc-devel
Requires: openssl-devel Requires: openssl-devel
Requires: zlib-devel Requires: zlib-devel
Summary: MariaDB development header files and libraries Summary: MariaDB development header files and libraries
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description -n libmysqlclient-devel %description -n libmysqlclient-devel
@ -124,22 +124,21 @@ This package contains the development header files and libraries
necessary to develop client applications for MariaDB. necessary to develop client applications for MariaDB.
%package -n libmysqld18 %package -n libmysqld18
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB embedded server development files Summary: MariaDB embedded server development files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-errormessages = %version
%description -n libmysqld18 %description -n libmysqld18
This package contains the development header files and libraries This package contains the development header files and libraries
for developing applications that embed the MariaDB. for developing applications that embed the MariaDB.
%package -n libmysqld-devel %package -n libmysqld-devel
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB embedded server development files Summary: MariaDB embedded server development files
Group: Development/Libraries/C and C++
# the headers files are the shared # the headers files are the shared
Requires: libmysqlclient-devel = %version Requires: libmysqlclient-devel = %version
Requires: tcpd-devel
Requires: libmysqld18 = %version Requires: libmysqld18 = %version
Group: Development/Libraries/C and C++ Requires: tcpd-devel
%description -n libmysqld-devel %description -n libmysqld-devel
This package contains the development header files and libraries This package contains the development header files and libraries
@ -148,7 +147,6 @@ for developing applications that embed the MariaDB.
%package -n libmysqlclient18 %package -n libmysqlclient18
Summary: Shared Libraries for MariaDB Summary: Shared Libraries for MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other Group: Development/Libraries/Other
%description -n libmysqlclient18 %description -n libmysqlclient18
@ -157,7 +155,6 @@ languages and applications need to dynamically load and use MariaDB.
%package -n libmysqlclient_r18 %package -n libmysqlclient_r18
Summary: Shared Libraries for MariaDB Summary: Shared Libraries for MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other Group: Development/Libraries/Other
%description -n libmysqlclient_r18 %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 server daemon as well as the embedded server
%package bench %package bench
Requires: %{name}-client perl-DBD-mysql Requires: %{name}-client
Requires: perl-DBD-mysql
Summary: Benchmarks for MariaDB Summary: Benchmarks for MariaDB
Group: Productivity/Databases/Tools Group: Productivity/Databases/Tools
Provides: mysql-bench = %{srv_vers} 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 Summary: MariaDB with debug options turned on
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Requires: %{name} = %{version} Requires: %{name} = %{version}
Provides: mysql-debug = %{srv_vers}
Provides: %{name}-debug = %{srv_vers} Provides: %{name}-debug = %{srv_vers}
Provides: mysql-debug = %{srv_vers}
%if 0%{?use_extra_provides} > 0 %if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-debug-verion = %{version} Provides: %{extra_provides}-debug-verion = %{version}
Obsoletes: %{extra_provides}-debug-version < %{version} Obsoletes: %{extra_provides}-debug-version < %{version}
@ -236,10 +234,10 @@ information on how to use the debug server.
Summary: Testsuite for MariaDB Summary: Testsuite for MariaDB
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{name}-client = %{version}
Requires: perl-DBD-mysql
Requires: %{name}-tools = %{version}
Requires: %{name}-bench = %{version} Requires: %{name}-bench = %{version}
Requires: %{name}-client = %{version}
Requires: %{name}-tools = %{version}
Requires: perl-DBD-mysql
Provides: mysql-test = %{srv_vers} Provides: mysql-test = %{srv_vers}
%if 0%{?use_extra_provides} > 0 %if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-test = %{version} Provides: %{extra_provides}-test = %{version}