rpms/mariadb
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Reword lines applying OpenSSL patch to match Fedora SPECfile

Browse Source 
Keeping the SPECfiles close helps with cherry-picking changes

Related: #2036983
This commit is contained in:
Michal Schorm 2022-01-11 08:30:57 +01:00
parent 793527ec85
commit a76a3c657b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mariadb.spec
View File

@ -220,10 +220,12 @@ Patch9: %{pkgnamepatch}-ownsetup.patch
Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch
# Patch11: Use PCDIR CMake option, if configured # Patch11: Use PCDIR CMake option, if configured
Patch11: %{pkgnamepatch}-pcdir.patch Patch11: %{pkgnamepatch}-pcdir.patch
# Patch12: OpenSSL 3 patch
# Picked from the upstream developement branch for MariaDB 10.8.
# https://jira.mariadb.org/browse/MDEV-25785
Patch12: %{pkgnamepatch}-openssl3.patch
# Patch15: Add option to edit groonga's and groonga-normalizer-mysql install path # Patch15: Add option to edit groonga's and groonga-normalizer-mysql install path
Patch15: %{pkgnamepatch}-groonga.patch Patch15: %{pkgnamepatch}-groonga.patch
# Patch16: Fix openssl 3.0 compatibility at least partially (some tests still fail)
Patch16: %{pkgnamepatch}-openssl3.patch
BuildRequires: make BuildRequires: make
BuildRequires: cmake gcc-c++ BuildRequires: cmake gcc-c++
@ -751,8 +753,10 @@ rm -r storage/rocksdb/
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
%patch12 -p1
%endif
%patch15 -p1 %patch15 -p1
%patch16 -p1
# generate a list of tests that fail, but are not disabled by upstream # generate a list of tests that fail, but are not disabled by upstream
cat %{SOURCE50} | tee -a mysql-test/unstable-tests cat %{SOURCE50} | tee -a mysql-test/unstable-tests