- splitted out error messages and put them into diferent directory

- updated to MariaDB 5.5.25
  * Release notes:
    http://kb.askmonty.org/v/mariadb-5525-release-notes
  * Changelog:
    http://kb.askmonty.org/v/mariadb-5525-changelog
- updated to MariaDB 5.5.24

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=89

build.inc

@@ -102,6 +102,7 @@ BuildMySQL() {
 			-DWITH_LIBEDIT=0                                             \
 			-DINSTALL_LAYOUT=RPM                                         \
 			-DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock                   \
+			-DINSTALL_MYSQLSHAREDIR=/usr/share/%{name}                   \
 			-DWITH_COMMENT="openSUSE MySQL rpm"                          \
 			-DWITH_EXTRA_CHARSET=all                                     \
 			-DDEFAULT_CHARSET=utf8  -DDEFAULT_COLLATION=utf8_general_ci  \

configuration-tweaks.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fc9cfcc3c103fd463dcc189b4491ee6fab5f274d863cdeb269e401225a90011
+oid sha256:a0f8a41033b8df8235bd98a5c03639a45a328ac3e037ec17c7cc1212f71e4765
-size 219
+size 220

install.inc

@@ -20,6 +20,11 @@ rm -f %buildroot%_libdir/mysql/plugin/*a
 rm -f %buildroot%_libdir/mysql/libndbclient.*
 rm -f %{buildroot}/usr/share/mysql-test/mysql-test-run  
 rm -f %{buildroot}/usr/share/mysql-test/mtr
+rm -f %{buildroot}/usr/share/mysql/binary-configure
+rm -f %{buildroot}/usr/share/mysql/errmsg-utf8.txt
+rm -f %{buildroot}/usr/share/mysql/magic
+rm -f %{buildroot}/usr/share/mysql/mysql-log-rotate
+rm -f %{buildroot}/usr/share/mysql/mysql*.server
 rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
 ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mtr  
 ln -sf mysql-test-run.pl %{buildroot}/usr/share/mysql-test/mysql-test-run 
@@ -56,6 +61,19 @@ filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files
 filelist ndb_mgmd >mysql-ndb-management.files
 filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files
 filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files
+errmsg_list()
+{
+	echo '%%defattr(-, root, root)'
+	pushd %buildroot >/dev/null
+	for f in usr/share/%{name}/*; do
+		if test -e $f/errmsg.sys; then
+			echo "%%dir /$f"
+		fi
+	done
+	echo /usr/share/%{name}/errmsg-utf8.txt
+	popd >/dev/null
+}
+errmsg_list > errormessages.files
 ### files not installed by make install
 # Create directory structure
 DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini)
@@ -136,5 +154,15 @@ if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then
 fi
 mkdir -p '%buildroot'/etc/mysql
 bzip2 -cd '%_sourcedir'/configuration-tweaks.tar.bz2 | tar -C '%buildroot'/etc/mysql -xvf -
+if [ -z "`ls '%buildroot'/usr/share/info/mysql.info*`" ]; then
+	install -D -m 0644 Docs/mysql.info "%buildroot/usr/share/info/mysql.info"
+	gzip -9 "%buildroot/usr/share/info/mysql.info"
+fi
+if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so`" ]; then
+	echo '%%dir %%_libdir/mysql'               >> mysql-client.files
+	echo '%%dir %%_libdir/mysql/plugin'        >> mysql-client.files
+	echo '%%_libdir/mysql/plugin/dialog*.so'   >> mysql-client.files
+fi
 rm -rf '%buildroot'/etc/my.cnf.d
 rm -rf '%buildroot'/usr/share/doc/%{name}-%{version}
+rm -rf '%buildroot'/usr/share/mysql/SELinux

mariadb-5.5.24.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4223517a8c3fd3edd496268c3831798421fafb85d49b7f99e973f0158ae18fd3
-size 20943519

mariadb-5.5.25.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37fe39ca343c6fabab50edb446b19a5c68966933249f75451806607c689d68a8
+size 20987206

mariadb.changes

@@ -1,7 +1,21 @@
+-------------------------------------------------------------------
+Mon Jun 25 14:05:10 CEST 2012 - mhrusecky@suse.cz
+
+- splitted out error messages and put them into diferent directory
+
+-------------------------------------------------------------------
+Sat Jun 23 09:52:00 CEST 2012 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.5.25
+  * Release notes:
+    http://kb.askmonty.org/v/mariadb-5525-release-notes
+  * Changelog:
+    http://kb.askmonty.org/v/mariadb-5525-changelog
+
 -------------------------------------------------------------------
 Tue Jun 19 10:52:13 CEST 2012 - mhrusecky@suse.cz
 
-- updated to MariaDB 5.3.6
+- updated to MariaDB 5.5.24
   * Release notes:
     http://kb.askmonty.org/v/mariadb-5524-release-notes
   * Changelog:

mariadb.spec

@@ -34,9 +34,9 @@
 
 Name:           mariadb
 Summary:        Server part of MariaDB
-Version:        5.5.24
+Version:        5.5.25
 Release:        1
-%define srv_vers 5.5.24
+%define srv_vers 5.5.25
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Productivity/Databases/Servers
 Url:            http://www.mariab.org
@@ -76,6 +76,7 @@ Requires:       logrotate
 %endif
 # required by rcmysql
 Requires:       %{name}-client perl-base
+Requires:       %{name}-errormessages = %version
 Provides:       mysql-Max = %{srv_vers}
 Provides:       mysql = %{srv_vers}
 %if 0%{?use_extra_provides} > 0
@@ -118,6 +119,7 @@ necessary to develop client applications for MariaDB.
 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
@@ -141,6 +143,7 @@ for developing applications that embed the MariaDB.
 Summary:        Shared Libraries for MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Development/Libraries/Other
+Requires:       %{name}-errormessages = %version
 
 %description -n libmariadbclient18
 This package contains the shared libraries (.so) which certain
@@ -150,6 +153,7 @@ languages and applications need to dynamically load and use MariaDB.
 Summary:        Shared Libraries for MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
 Group:          Development/Libraries/Other
+Requires:       %{name}-errormessages = %version
 
 %description -n libmariadbclient_r18
 This package contains the shared libraries (.so) which certain
@@ -172,6 +176,14 @@ Conflicts:      otherproviders(mysql-client)
 %description client
 This package contains the standard clients for MariaDB.
 
+%package errormessages
+Summary:        MySQL Community Server development header files and libraries
+Group:          Development/Libraries/C and C++
+
+%description errormessages
+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
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@@ -454,7 +466,12 @@ fi
 %doc %{_infodir}/mysql.info.*
 /etc/init.d/mysql
 /usr/sbin/rcmysql
-/usr/share/mysql/
+%dir /usr/share/%{name}
+%dir /usr/share/mysql
+/usr/share/%{name}/charsets/
+/usr/share/mysql/*.cnf
+/usr/share/mysql/*.ini
+/usr/share/%{name}/*.sql
 %ghost %dir %attr(755,mysql,mysql)/var/run/mysql
 %dir %{_libdir}/mysql
 %{_libdir}/mysql/mysqld.sym
@@ -462,6 +479,10 @@ fi
 %dir %_libdir/mysql/plugin
 %_libdir/mysql/plugin/[!d]*.so
 
+%files errormessages -f errormessages.files
+%defattr(-, root, root)
+/usr/share/%{name}/*/errmsg.sys
+
 %files client -f mysql-client.files
 %defattr(-, root, root)
 %config(noreplace) %attr(0640, root, mysql) /etc/mysqlaccess.conf
@@ -489,9 +510,6 @@ fi
 %files -n libmariadbclient18
 %defattr(-, root, root)
 %{_libdir}/libmariadbclient.so.*
-%dir %_libdir/mysql
-%dir %_libdir/mysql/plugin
-%_libdir/mysql/plugin/dialog*.so
 
 %if 0%{cluster} > 1
 

mysql-patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d57f2d60bc39bfbd12e699015bdd106a246390a977625288b31b23bba27372ee
+oid sha256:fd455e9fb3f3dd1d6f50436742d8273ca4fd7ec2954cf86ac9a571325e28dbd6
-size 11019
+size 11057

series

@@ -4,7 +4,7 @@ mysql-community-server-5.1.46-logrotate.patch
 mariadb-5.1.50-strncat-overflow.patch
 mariadb-5.2.6-install_db-quiet.patch
 mysql-community-server-5.1.51-mysql_config.patch
-mysql-community-server-5.1.51-mysqld_multi-features.patch
+mariadb-5.5.25-mysqld_multi-features.patch
 mariadb-5.1.50-upgrade-exit-status.patch
 mariadb-5.2.3-cnf.patch
 mysql-community-server-5.5.6-safe-process-in-bin.patch