From bcc2df97450cb3eda8bc531c483a918e6f2e18cbb2d4c0dc3b2b53493397c2e1 Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Wed, 29 Nov 2023 12:09:58 +0000
Subject: [PATCH] Accepting request 1129562 from
 home:jirislaby:branches:server:database

- Fix location of unwanted binaries (which are deleted)
- Fix location in rpmlintrc
- Disable LTO on ppc64le due to error
- constraints: increase memory to 16G on ppc64le, 10G is no longer enough
  (perhaps a linker bug?)

OBS-URL: https://build.opensuse.org/request/show/1129562
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=315
---
 _constraints      | 12 +++++++++++-
 mariadb-rpmlintrc | 14 +++++++-------
 mariadb.changes   |  9 +++++++++
 mariadb.spec      |  8 ++++----
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/_constraints b/_constraints
index 524d176..fc5af51 100644
--- a/_constraints
+++ b/_constraints
@@ -13,7 +13,6 @@
       <arch>i586</arch>
       <arch>x86_64</arch>
       <arch>aarch64</arch>
-      <arch>ppc64le</arch>
       <arch>ppc</arch>
     </conditions>
     <hardware>
@@ -22,4 +21,15 @@
       </physicalmemory>
     </hardware>
   </overwrite>
+
+  <overwrite>
+    <conditions>
+      <arch>ppc64le</arch>
+    </conditions>
+    <hardware>
+      <physicalmemory>
+        <size unit="G">16</size>
+      </physicalmemory>
+    </hardware>
+  </overwrite>
 </constraints>
diff --git a/mariadb-rpmlintrc b/mariadb-rpmlintrc
index 2143a5a..2f29857 100644
--- a/mariadb-rpmlintrc
+++ b/mariadb-rpmlintrc
@@ -2,7 +2,7 @@
 
 # Zero-length
 # Some test results can be zero-length files
-addFilter(r'(zero-length|pem-certificate) /usr/share/mysql-test/*')
+addFilter(r'(zero-length|pem-certificate) /usr/share/mariadb-test/*')
 
 # Permissions
 # wsrep_sst_common
@@ -15,11 +15,11 @@ addFilter(r'script-without-shebang /usr/bin/wsrep_sst_common')
 # Support both rpmlint 1.x and 2.x
 # Wrong location
 # wsrep_check_version is a wsrep version check utility. Used in testing only.
-addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/lib/My/SafeProcess/wsrep_check_version')
-addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/lib/My/SafeProcess/wsrep_check_version')
+addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mariadb-test/lib/My/SafeProcess/wsrep_check_version')
+addFilter(r'arch-dependent-file-in-usr-share /usr/share/mariadb-test/lib/My/SafeProcess/wsrep_check_version')
 # my_safe_process is an utility that encapsulates process creation, monitoring and cleanup. Used in testing only.
-addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/lib/My/SafeProcess/my_safe_process')
-addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/lib/My/SafeProcess/my_safe_process')
+addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mariadb-test/lib/My/SafeProcess/my_safe_process')
+addFilter(r'arch-dependent-file-in-usr-share /usr/share/mariadb-test/lib/My/SafeProcess/my_safe_process')
 # pam_mariadb_mtr.so is a pam module to test pam authentication plugin. Used in pam.test only.
-addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so')
-addFilter(r'arch-dependent-file-in-usr-share /usr/share/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so')
+addFilter(r'arch-dependent-file-in-usr-share .* /usr/share/mariadb-test/suite/plugins/pam/pam_mariadb_mtr.so')
+addFilter(r'arch-dependent-file-in-usr-share /usr/share/mariadb-test/suite/plugins/pam/pam_mariadb_mtr.so')
diff --git a/mariadb.changes b/mariadb.changes
index 52c5f9e..53d400c 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Nov 27 13:28:45 UTC 2023 - Jiri Slaby <jslaby@suse.cz>
+
+- Fix location of unwanted binaries (which are deleted)
+- Fix location in rpmlintrc
+- Disable LTO on ppc64le due to error
+- constraints: increase memory to 16G on ppc64le, 10G is no longer enough
+  (perhaps a linker bug?)
+
 -------------------------------------------------------------------
 Tue Oct 17 15:27:14 UTC 2023 - Danilo Spinella <danilo.spinella@suse.com>
 
diff --git a/mariadb.spec b/mariadb.spec
index a6459de..3421746 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -535,12 +535,12 @@ rm %{buildroot}%{_libdir}/*.a
 rm -f %{buildroot}%{_datadir}/mysql/{errmsg-utf8.txt,mysql-log-rotate}
 rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
 # binary-configure creates the MySQL system tables and starts the server (not used)
-rm -f %{buildroot}%{_datadir}/mysql/binary-configure
+rm -f %{buildroot}%{_datadir}/%{name}/binary-configure
 # FS files first-bytes recoginiton (not updated by upstream since nobody realy use that)
-rm -f %{buildroot}%{_datadir}/mysql/magic
+rm -f %{buildroot}%{_datadir}/%{name}/magic
 # Upstream ships them because of MDEV-10797 (we don't need them as we use our own systemd scripts)
-rm -f %{buildroot}%{_datadir}/mysql/mysql.server
-rm -f %{buildroot}%{_datadir}/mysql/mysqld_multi.server
+rm -f %{buildroot}%{_datadir}/%{name}/mysql.server
+rm -f %{buildroot}%{_datadir}/%{name}/mysqld_multi.server
 # upstream installs links for mysql
 unlink %{buildroot}%{_datadir}/%{name}/systemd/mysql.service
 unlink %{buildroot}%{_datadir}/%{name}/systemd/mysqld.service