Accepting request 126076 from server:database

- 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 * Release notes: http://kb.askmonty.org/v/mariadb-5524-release-notes * Changelog: http://kb.askmonty.org/v/mariadb-5524-changelog OBS-URL: https://build.opensuse.org/request/show/126076 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=19
2012-06-28 13:33:17 +00:00 · 2012-06-28 13:33:17 +00:00 · 73f0bcf419
commit 73f0bcf419
parent 201f6820c3 8519420d13
9 changed files with 88 additions and 16 deletions
--- a/build.inc
+++ b/build.inc
@ -6,7 +6,7 @@
 %if 0%{?suse_version} > 1140
 export WARN_DIS="$WARN_DIS -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter "
 %endif
-export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DFORCE_INIT_OF_VARS $WARN_DIS "
+export CFLAGS="$RPM_OPT_FLAGS -DPIC -fPIC -DUNDEF_HAVE_INITGROUPS -DFORCE_INIT_OF_VARS $WARN_DIS "
 export CXXFLAGS="$CFLAGS -fno-exceptions -fno-rtti"

 %if 0%{use_cmake} < 1
@ -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  \
--- a/configuration-tweaks.tar.bz2
+++ b/configuration-tweaks.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4874cb4a3c8a9f81cdc49aaf91de9e03bf36e46721a86355cf5fbe07cd7d7613
-size 217
+oid sha256:8de7d12f96916bb2847d171efcc8acfd30678051d7af9c66f96fcbd4d2db8209
+size 220
--- a/install.inc
+++ b/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,3 +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
--- a/mariadb-5.5.23.tar.bz2
+++ b/mariadb-5.5.23.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a1ac784a9e69a35a901b057c64d03d118aa58a4b41e3eed948638e3651f5b74
-size 20969691
--- a/mariadb-5.5.25.tar.bz2
+++ b/mariadb-5.5.25.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37fe39ca343c6fabab50edb446b19a5c68966933249f75451806607c689d68a8
+size 20987206
--- a/mariadb.changes
+++ b/mariadb.changes
@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+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.5.24
+  * Release notes:
+    http://kb.askmonty.org/v/mariadb-5524-release-notes
+  * Changelog:
+    http://kb.askmonty.org/v/mariadb-5524-changelog
+
 -------------------------------------------------------------------
 Sat Jun  9 18:30:56 UTC 2012 - xgpub@tellas.gr

--- a/mariadb.spec
+++ b/mariadb.spec
@ -34,9 +34,9 @@

 Name:           mariadb
 Summary:        Server part of MariaDB
-Version:        5.5.23
+Version:        5.5.25
 Release:        1
-%define srv_vers 5.5.23
+%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
@ -163,6 +164,7 @@ Provides:       mysql-client = %{srv_vers}
 %if 0%{?use_extra_provides} > 0
 Provides:       %{extra_provides}-client = %{version}
 Obsoletes:      %{extra_provides}-client < %{version}
+Requires:       %{name}-errormessages = %version
 %endif
 %if 0%{?prefered} > 0
 Obsoletes:      mysql-client < %{srv_vers}
@ -172,6 +174,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
@ -339,7 +349,9 @@ mysql-patches/tools/apply-series.sh "%{S:12}"
 # remove unneeded manpages ('make install' basically installs everything under
 # man/*)
 rm -f man/mysqlman.1        # dummy fallback manpage
+[ \! -f man/CMakeLists.txt ] || sed -i 's|mysqlman.1||'     man/CMakeLists.txt
 rm -f man/mysql.server.1    # init script, not installed in our rpm
+[ \! -f man/CMakeLists.txt ] || sed -i 's|mysql.server.1||' man/CMakeLists.txt
 rm -f man/make_win_*.1      # windows build scripts
 rm -f man/comp_err.1        # built-time utility
 # 5.1 Carrier Grade Edition only / still under development as of 5.1.22
@ -452,7 +464,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
@ -460,6 +477,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
@ -487,9 +508,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

--- a/mysql-patches.tar.bz2
+++ b/mysql-patches.tar.bz2
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f165e6ee07af134e003c46eb59ac2fd2d2085108254c3ecb863b5eb16cd6c84
-size 11075
+oid sha256:fd455e9fb3f3dd1d6f50436742d8273ca4fd7ec2954cf86ac9a571325e28dbd6
+size 11057
--- a/4
+++ b/4
@ -4,9 +4,9 @@ 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
 mariadb-5.5.20-group.patch
-mariadb-5.5.23-ppc64-libdir.patch
+mariadb-5.5.24-ppc64-libdir.patch