From ef7b9821e808cd427a2bd52e03385750d6b83438d5f7f9cbb6f51f88a6e4df85 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 26 Oct 2017 08:04:48 +0000 Subject: [PATCH] Accepting request 536714 from home:bmwiedemann:branches:server:database Drop INFO_BIN from package because it is not needed and differs for every build (boo#1047218) An alternative approach would be https://github.com/MariaDB/server/pull/472 Diff looks thus: /usr/lib64/mysql/INFO_BIN differs (ASCII text, with very long lines) --- old//usr/lib64/mysql/INFO_BIN 2017-09-19 12:00:00.000000000 +0000 +++ new//usr/lib64/mysql/INFO_BIN 2017-09-19 12:00:00.000000000 +0000 @@ -1,5 +1,5 @@ ===== Information about the build process: ===== -Build was run at 2017-09-28 07:34:40 on host 'unknown' +Build was run at 2018-11-03 20:51:24 on host 'unknown' Build was done on Linux-4.13.3-1-default using x86_64 OBS-URL: https://build.opensuse.org/request/show/536714 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=194 --- mariadb.changes | 6 ++++++ mariadb.spec | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mariadb.changes b/mariadb.changes index e632dd4..1e1aaf4 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 26 05:16:30 UTC 2017 - bwiedemann@suse.com + +- Drop INFO_BIN from package because it is not needed + and differs for every build (boo#1047218) + ------------------------------------------------------------------- Tue Sep 19 15:54:05 UTC 2017 - vcizek@suse.com diff --git a/mariadb.spec b/mariadb.spec index c0a3dfe..ef21d96 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -460,9 +460,8 @@ install -d -m 700 %{buildroot}%{_localstatedir}/log/mysql/ # Symbols from build to go into libdir install -m 644 build/sql/mysqld.sym %{buildroot}%{_libdir}/mysql/mysqld.sym -# INFO_BIN and INFO_SRC binaries +# INFO_SRC binary install -p -m 644 build/Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/ -install -p -m 644 build/Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/ # Remove debug management for keys Mariadb 101+ rm -f %{buildroot}%{_libdir}/mysql/plugin/debug_key_management.so @@ -768,7 +767,6 @@ rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} %{_datadir}/%{name}/*.sql %dir %{_libdir}/mysql %{_libdir}/mysql/mysqld.sym -%{_libdir}/mysql/INFO_BIN %{_libdir}/mysql/INFO_SRC %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/mysql %dir %{_libdir}/mysql/plugin