Hello community,
here is the log from the commit of package mysql-community-server for
openSUSE:12.2 checked in at 2012-08-22 11:58:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2/mysql-community-server (Old)
and /work/SRC/openSUSE:12.2/.mysql-community-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-community-server", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:12.2/mysql-community-server/mysql-community-server.changes
2012-07-14 11:51:05.000000000 +0200
+++
/work/SRC/openSUSE:12.2/.mysql-community-server.new/mysql-community-server.changes
2012-08-22 11:58:52.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Aug 20 14:35:46 UTC 2012 - meiss...@suse.com
+
+- require errormessages in the same version also in libmysqld18,
+ doing again after messed up merge. bnc#712749
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-community-server.spec ++++++
--- /var/tmp/diff_new_pack.kGxJ19/_old 2012-08-22 11:58:54.000000000 +0200
+++ /var/tmp/diff_new_pack.kGxJ19/_new 2012-08-22 11:58:54.000000000 +0200
@@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
# Few definitions which will alter build
%define prefered 1
@@ -34,11 +33,11 @@
Name: mysql-community-server
Summary: Server part of MySQL Community Server
-Version: 5.5.25a
-Release: 1
-%define srv_vers 5.5.25a
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Productivity/Databases/Servers
+Version: 5.5.25a
+Release: 0
+%define srv_vers 5.5.25a
Url: http://www.mysql.com
Source: mysql-%{version}.tar.bz2
Source2: baselibs.conf
@@ -84,10 +83,11 @@
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}
@@ -128,13 +128,12 @@
# 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: MySQL Community Server development header files and libraries
-License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/C and C++
%description -n libmysqlclient-devel
@@ -142,22 +141,21 @@
necessary to develop client applications for MySQL Community Server.
%package -n libmysqld18
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MySQL Community Server 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 MySQL Community Server.
%package -n libmysqld-devel
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MySQL Community Server 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
@@ -166,7 +164,6 @@
%package -n libmysqlclient18
Summary: Shared Libraries for MySQL Community Server
-License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other
%description -n libmysqlclient18
@@ -175,7 +172,6 @@
%package -n libmysqlclient_r18
Summary: Shared Libraries for MySQL Community Server
-License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other
%description -n libmysqlclient_r18
@@ -183,7 +179,6 @@
languages and applications need to dynamically load and use MySQL Community
Server.
%package client
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: Client for MySQL Community Server
Group: Productivity/Databases/Clients
Provides: mysql-client = %{srv_vers}
@@ -209,8 +204,8 @@
server daemon as well as the embedded server
%package bench
-Requires: %{name}-client perl-DBD-mysql
-License: SUSE-GPL-2.0-with-FLOSS-exception
+Requires: %{name}-client
+Requires: perl-DBD-mysql
Summary: Benchmarks for MySQL Community Server
Group: Productivity/Databases/Tools
Provides: mysql-bench = %{srv_vers}
@@ -231,12 +226,11 @@
%package debug-version
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MySQL Community Server 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}
@@ -254,14 +248,13 @@
information on how to use the debug server.
%package test
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: Testsuite for MySQL Community Server
Group: Productivity/Databases/Servers
Requires: %{name} = %{version}
+Requires: %{name}-bench = %{version}
Requires: %{name}-client = %{version}
-Requires: perl-DBD-mysql
Requires: %{name}-tools = %{version}
-Requires: %{name}-bench = %{version}
+Requires: perl-DBD-mysql
Provides: mysql-test = %{srv_vers}
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-test = %{version}
@@ -278,13 +271,13 @@
To run the testsuite, run /usr/share/mysql-test/suse-test-run.
%package tools
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MySQL Community Server tools
Group: Productivity/Databases/Servers
Requires: perl-DBD-mysql
# make sure this package is installed when updating from 10.2 and older
-Provides: mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror
+Provides: mysql-client:/usr/bin/perror
Provides: mysql-tools = %{srv_vers}
+Provides: mysql:/usr/bin/mysqlhotcopy
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-tools = %{version}
Obsoletes: %{extra_provides}-tools < %{version}
@@ -304,7 +297,6 @@
%package -n libndbclient6
Summary: Shared Libraries for cluster client
-License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other
%description -n libndbclient6
@@ -315,7 +307,6 @@
%endif
%package ndb-storage
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MySQL Community Server - ndbcluster storage engine
Group: Productivity/Databases/Servers
Provides: mysql-ndb-storage = %{srv_vers}
@@ -329,7 +320,6 @@
%package ndb-management
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MySQL Community Server - ndbcluster storage engine management
Group: Productivity/Databases/Servers
Provides: mysql-ndb-management = %{srv_vers}
@@ -342,7 +332,6 @@
one computer in the cluster.
%package ndb-tools
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MySQL Community Server - ndbcluster storage engine basic tools
Group: Productivity/Databases/Servers
Provides: mysql-ndb-tools = %{srv_vers}
@@ -353,7 +342,6 @@
This package contains ndbcluster storage engine basic tools.
%package ndb-extra
-License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MySQL Community Server - ndbcluster storage engine extra tools
Group: Productivity/Databases/Servers
Provides: mysql-ndb-extra = %{srv_vers}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
