Hello community, here is the log from the commit of package mysql-community-server for openSUSE:Factory checked in at 2012-03-20 17:47:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old) and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-community-server", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes 2012-03-01 17:21:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes 2012-03-20 17:47:28.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 16 15:01:14 UTC 2012 - dval...@suse.com + +- fix libdir for ppc64 + +------------------------------------------------------------------- +Wed Mar 14 15:57:38 UTC 2012 - mhruse...@suse.cz + +- better va_list handling (fixes build on arm) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-community-server.spec ++++++ --- /var/tmp/diff_new_pack.l9PHOv/_old 2012-03-20 17:47:31.000000000 +0100 +++ /var/tmp/diff_new_pack.l9PHOv/_new 2012-03-20 17:47:31.000000000 +0100 @@ -22,6 +22,8 @@ %define use_cmake 1 %define cluster 0 %define builtin_plugins partition,csv,heap,myisam,innobase +%define use_extra_provides 1 +%define extra_provides mysql-community-server_55 %if %{?rel:0}%{!?rel:1} %define rel 1 @@ -76,6 +78,10 @@ Requires: %{name}-client perl-base Provides: mysql-Max = %{srv_vers} Provides: mysql = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides} = %{version} +Obsoletes: %{extra_provides} < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql < %{srv_vers} Obsoletes: mysql-Max < %{srv_vers} @@ -171,6 +177,10 @@ Summary: Client for MySQL Community Server Group: Productivity/Databases/Clients Provides: mysql-client = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-client = %{version} +Obsoletes: %{extra_provides}-client < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-client < %{srv_vers} %endif @@ -185,6 +195,10 @@ Summary: Benchmarks for MySQL Community Server Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-bench = %{version} +Obsoletes: %{extra_provides}-bench < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-bench < %{srv_vers} %endif @@ -204,6 +218,10 @@ Requires: %{name} = %{version} Provides: mysql-debug = %{srv_vers} Provides: %{name}-debug = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-debug-verion = %{version} +Obsoletes: %{extra_provides}-debug-version < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-debug < %{srv_vers} %endif @@ -226,6 +244,10 @@ Requires: %{name}-tools = %{version} Requires: %{name}-bench = %{version} Provides: mysql-test = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-test = %{version} +Obsoletes: %{extra_provides}-test < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-test < %{srv_vers} %endif @@ -244,6 +266,10 @@ # 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-tools = %{srv_vers} +%if 0%{?use_extra_provides} > 0 +Provides: %{extra_provides}-tools = %{version} +Obsoletes: %{extra_provides}-tools < %{version} +%endif %if 0%{?prefered} > 0 Obsoletes: mysql-tools < %{srv_vers} %endif ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ mysql-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.5.21-ppc64-libdir.patch new/mysql-patches/mysql-patches/mysql-community-server-5.5.21-ppc64-libdir.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.5.21-ppc64-libdir.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.5.21-ppc64-libdir.patch 2012-03-16 13:27:30.000000000 +0100 @@ -0,0 +1,19 @@ +PATCH-P1-FIX-SUSE: set libdir for ppc64 correctly + +The patch sets correct libdir for ppc64 + +Maintainer: Michal Hrusecky <michal.hruse...@opensuse.org> + +Index: mysql-5.5.21/cmake/install_layout.cmake +=================================================================== +--- mysql-5.5.21.orig/cmake/install_layout.cmake ++++ mysql-5.5.21/cmake/install_layout.cmake +@@ -138,7 +138,7 @@ SET(INSTALL_BINDIR_RPM + SET(INSTALL_SBINDIR_RPM "sbin") + SET(INSTALL_SCRIPTDIR_RPM "bin") + # +-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") ++IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" ) + SET(INSTALL_LIBDIR_RPM "lib64") + SET(INSTALL_PLUGINDIR_RPM "lib64/mysql/plugin") + ELSE() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mysql-patches/mysql-patches/mysql-community-server-5.5.21-va_list-handling.patch new/mysql-patches/mysql-patches/mysql-community-server-5.5.21-va_list-handling.patch --- old/mysql-patches/mysql-patches/mysql-community-server-5.5.21-va_list-handling.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/mysql-patches/mysql-patches/mysql-community-server-5.5.21-va_list-handling.patch 2012-03-14 15:48:25.000000000 +0100 @@ -0,0 +1,47 @@ +PATCH-P0-FIX-HACK: Provide correct types + +Fixed compilation issue when compiler expects va_list but instead get's int, +namely 0. + +Maintainer: Michal Hrusecky <mhruse...@suse.cz> + +Index: sql-common/client_plugin.c +=================================================================== +--- sql-common/client_plugin.c.orig ++++ sql-common/client_plugin.c +@@ -227,6 +227,7 @@ static void load_env_plugins(MYSQL *mysq + int mysql_client_plugin_init() + { + MYSQL mysql; ++ va_list empty_va; + struct st_mysql_client_plugin **builtin; + + if (initialized) +@@ -244,7 +245,7 @@ int mysql_client_plugin_init() + pthread_mutex_lock(&LOCK_load_client_plugin); + + for (builtin= mysql_client_builtins; *builtin; builtin++) +- add_plugin(&mysql, *builtin, 0, 0, 0); ++ add_plugin(&mysql, *builtin, 0, 0, empty_va); + + pthread_mutex_unlock(&LOCK_load_client_plugin); + +@@ -288,6 +289,7 @@ struct st_mysql_client_plugin * + mysql_client_register_plugin(MYSQL *mysql, + struct st_mysql_client_plugin *plugin) + { ++ va_list empty_va; + if (is_not_initialized(mysql, plugin->name)) + return NULL; + +@@ -302,7 +304,9 @@ mysql_client_register_plugin(MYSQL *mysq + plugin= NULL; + } + else +- plugin= add_plugin(mysql, plugin, 0, 0, 0); ++ { ++ plugin= add_plugin(mysql, plugin, 0, 0, empty_va); ++ } + + pthread_mutex_unlock(&LOCK_load_client_plugin); + return plugin; ++++++ series ++++++ --- /var/tmp/diff_new_pack.l9PHOv/_old 2012-03-20 17:47:31.000000000 +0100 +++ /var/tmp/diff_new_pack.l9PHOv/_new 2012-03-20 17:47:31.000000000 +0100 @@ -12,3 +12,5 @@ mysql-community-server-5.1.51-mysqld_multi-features.patch mysql-community-server-5.1.51-upgrade-exit-status.patch mysql-community-server-5.5.12-shared-libmysqld.patch +mysql-community-server-5.5.21-va_list-handling.patch +mysql-community-server-5.5.21-ppc64-libdir.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org