The package rpms/mariadb.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/mariadb.git/commit/?id=47aa81f0f8...
https://src.fedoraproject.org/cgit/rpms/mariadb.git/commit/?id=655de675c8....
Change:
-%ifarch x86_64 ppc64le aarch64 armv7hl
+%ifarch ppc ppc64 ppc64p7 ppc64le
Thanks.
Full change:
============
commit 47a4d5b48fffeafa4349fcb3ac544cc3a644ba61
Author: Honza Horak <hhorak(a)redhat.com>
Date: Mon Aug 7 18:31:37 2017 +0200
Add mysqld_port_t definition also for udp as it is documented in the README
diff --git a/mariadb.spec b/mariadb.spec
index 9a32eeb..4f572b4 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1070,7 +1070,9 @@ export MTR_BUILD_THREAD=%{__isa_bits}
%if %{with galera}
%post server-galera
+# README at support-files/policy/selinux/README recommends:
semanage port -a -t mysqld_port_t -p tcp 4568 >/dev/null 2>&1 || :
+semanage port -a -t mysqld_port_t -p udp 4567 >/dev/null 2>&1 || :
semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp >/dev/null
2>&1 || :
%endif
commit fe1ebbe8f14a0d40365cda19707a8acee6af1426
Author: Honza Horak <hhorak(a)redhat.com>
Date: Mon Aug 7 18:19:50 2017 +0200
Use with init_systemd condition to build fine on RHEL-6
diff --git a/mariadb.spec b/mariadb.spec
index 89e4274..9a32eeb 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -1216,8 +1216,8 @@ fi
%doc Docs/README.wsrep
%license LICENSE.clustercheck
%{_bindir}/clustercheck
-%if %{with init_systemd}
%{_bindir}/galera_new_cluster
+%if %{with init_systemd}
%{_bindir}/galera_recovery
%{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf
%endif
@@ -1339,11 +1339,13 @@ fi
%{_datadir}/%{pkg_name}/policy/selinux/README
%{_datadir}/%{pkg_name}/policy/selinux/mariadb-server.*
%{_datadir}/%{pkg_name}/policy/selinux/mariadb.*
+%if %{with init_systemd}
%{_datadir}/%{pkg_name}/systemd/mariadb.service
# mariadb@ is installed only when we have cmake newer than 3.3
%if 0%{?fedora} > 22 || 0%{?rhel} > 7
%{_datadir}/%{pkg_name}/systemd/mariadb@.service
%endif
+%endif
%{daemondir}/%{daemon_name}*
%{_libexecdir}/mysql-prepare-db-dir
commit 47aa81f0f878df2b2348a54d6ec0c52fb241c1a6
Author: Honza Horak <hhorak(a)redhat.com>
Date: Mon Aug 7 18:18:08 2017 +0200
Use correct rocksdb conditions and remove bundled rocksdb if not compiled
diff --git a/mariadb.spec b/mariadb.spec
index a0c7404..89e4274 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -676,6 +676,9 @@ then
fi
}
+%if %{without rocksdb}
+rm -r storage/rocksdb/
+%endif
%build
@@ -1266,7 +1269,7 @@ fi
# Cracklib plugin
%config(noreplace) %{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf
# RocksDB engine
-%ifarch x86_64 ppc64le aarch64 armv7hl
+%if %{with rocksdb}
%config(noreplace) %{_sysconfdir}/my.cnf.d/rocksdb.cnf
%endif
commit ab242dbfda1c30af101df8fdea58a399496a469a
Author: Honza Horak <hhorak(a)redhat.com>
Date: Mon Aug 7 18:09:47 2017 +0200
Fix galera related selinux on RHEL-6
diff --git a/mariadb.spec b/mariadb.spec
index 4f0781b..a0c7404 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -658,6 +658,9 @@ cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
# prepare selinux policy
mkdir selinux
sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE72} >
selinux/%{name}-server-galera.te
+%if 0%{?rhel} == 6
+sed -i 's/kerberos_port_t/kerberos_master_port_t/'
selinux/%{name}-server-galera.te
+%endif
cat selinux/%{name}-server-galera.te
%endif
commit a06955c958bc8497a58a65fcf718f8091a9bb440
Author: Honza Horak <hhorak(a)redhat.com>
Date: Mon Aug 7 18:08:21 2017 +0200
Include each dependency on one line for better patches in the future
diff --git a/mariadb.spec b/mariadb.spec
index 21ccf28..4f0781b 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -427,7 +427,9 @@ Requires(posttrans): systemd
%{?systemd_requires: %systemd_requires}
%endif
# wsrep requirements
-Requires: lsof net-tools rsync
+Requires: lsof
+Requires: net-tools
+Requires: rsync
%if %{with mysql_names}
Provides: mysql-server = %{sameevr}
Provides: mysql-server%{?_isa} = %{sameevr}
commit 91f4ad0e191642e36a4e67f4fa3dc0c125041c27
Author: Honza Horak <hhorak(a)redhat.com>
Date: Mon Aug 7 18:06:22 2017 +0200
Add dependency for psmisc because of fuser call in mysql-check-socket
diff --git a/mariadb.spec b/mariadb.spec
index 5d62866..21ccf28 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -407,6 +407,8 @@ Requires: %{name}-errmsg%{?_isa} = %{sameevr}
Recommends: %{name}-server-utils%{?_isa} = %{sameevr}
Requires: %{_sysconfdir}/my.cnf
Requires: %{_sysconfdir}/my.cnf.d
+# for fuser in mysql-check-socket
+Requires: psmisc
Requires: coreutils
Requires(pre): /usr/sbin/useradd
# Sphinx storage engine
commit 655de675c8d97fa41de526b2b8f6b0cf7186f768
Author: Honza Horak <hhorak(a)redhat.com>
Date: Mon Aug 7 18:03:29 2017 +0200
Dividing test blacklists for s390 and ppc
diff --git a/mariadb.spec b/mariadb.spec
index 831a414..5d62866 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -151,7 +151,8 @@ Source18: mysql@.service.in
Source19: mysql.init.in
Source50: rh-skipped-tests-base.list
Source51: rh-skipped-tests-arm.list
-Source52: rh-skipped-tests-ppc-s390.list
+Source52: rh-skipped-tests-s390.list
+Source53: rh-skipped-tests-ppc.list
# Proposed upstream:
https://jira.mariadb.org/browse/MDEV-12442
# General upstream response was slightly positive
Source70: clustercheck.sh
@@ -637,9 +638,12 @@ cat %{SOURCE50} | tee -a mysql-test/unstable-tests
cat %{SOURCE51} | tee -a mysql-test/unstable-tests
%endif
-# TODO: divide ppc and s390
-%ifarch ppc ppc64 ppc64p7 s390 s390x
-cat %{SOURCE51} | tee -a mysql-test/unstable-tests
+%ifarch s390 s390x
+cat %{SOURCE52} | tee -a mysql-test/unstable-tests
+%endif
+
+%ifarch ppc ppc64 ppc64p7 ppc64le
+cat %{SOURCE53} | tee -a mysql-test/unstable-tests
%endif
cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc-s390.list
deleted file mode 100644
index e69de29..0000000
diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list
new file mode 100644
index 0000000..e69de29
diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list
new file mode 100644
index 0000000..e69de29