From 8179ff0a193697203a15dc8a82e0d06fa1fb7193 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 24 Nov 2020 01:30:19 +0100 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/mariadb.git#bda74cd11c4decba71950686cf28f57d977bbedc --- mariadb.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 0ef75a3..9482a72 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -728,6 +728,9 @@ rm -r storage/rocksdb/ %patch15 -p1 %patch16 -p1 +# workaround for upstream bug #56342 +#rm mysql-test/t/ssl_8k_key-master.opt + # generate a list of tests that fail, but are not disabled by upstream cat %{SOURCE50} | tee -a mysql-test/unstable-tests @@ -1134,6 +1137,7 @@ rm %{buildroot}%{_bindir}/{mariadb-client-test-embedded,mariadb-test-embedded} rm %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1* rm %{buildroot}%{_mandir}/man1/{mariadb-client-test-embedded,mariadb-test-embedded}.1* %endif # embedded +rm %{buildroot}%{_bindir}/test-connect-t rm %{buildroot}%{_bindir}/{mysql_client_test,mysqltest} rm %{buildroot}%{_bindir}/{mariadb-client-test,mariadb-test} rm %{buildroot}%{_mandir}/man1/{mysql_client_test,mysqltest,my_safe_process}.1* @@ -1144,6 +1148,7 @@ rm %{buildroot}/suite/plugins/pam/pam_mariadb_mtr.so %endif %if %{without galera} +rm %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf rm %{buildroot}%{_sysconfdir}/sysconfig/clustercheck rm %{buildroot}%{_bindir}/{clustercheck,galera_new_cluster} rm %{buildroot}%{_bindir}/galera_recovery @@ -1154,11 +1159,6 @@ rm %{buildroot}%{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf rm %{buildroot}%{_mandir}/man1/{mysql_,mariadb-}ldb.1* %endif -%if %{without backup} -rm %{buildroot}%{_mandir}/man1/maria{,db-}backup.1* -rm %{buildroot}%{_mandir}/man1/mbstream.1* -%endif - %check %if %{with test} %if %runselftest @@ -1365,10 +1365,8 @@ fi %{_bindir}/replace %{_bindir}/resolve_stack_dump %{_bindir}/resolveip -%if %{with galera} # wsrep_sst_common should be moved to /usr/share/mariadb: https://jira.mariadb.org/browse/MDEV-14296 %{_bindir}/wsrep_* -%endif %config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset @@ -1472,7 +1470,7 @@ fi %attr(0750,mysql,mysql) %dir %{logfiledir} # This does what it should. # RPMLint error "conffile-without-noreplace-flag /var/log/mariadb/mariadb.log" is false positive. -%attr(0660,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile} +%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile} %config(noreplace) %{logrotateddir}/%{daemon_name} %{_tmpfilesdir}/%{name}.conf