From 5dcec0d8d0d6d2b78992bdc2f2eed5639547da57 Mon Sep 17 00:00:00 2001
From: Michal Schorm <mschorm@redhat.com>
Date: Sat, 26 Feb 2022 05:14:00 +0100
Subject: [PATCH] Patch for pkgconfig directory has been upstreamed

The upstream implementation is to NOT make it configurable, but to put it on the correct location instead:
  https://github.com/MariaDB/server/commit/c5c1027c6eb0db9738c231731b664f9736970d98
---
 mariadb-pcdir.patch | 19 -------------------
 mariadb.spec        |  4 ----
 2 files changed, 23 deletions(-)
 delete mode 100644 mariadb-pcdir.patch

diff --git a/mariadb-pcdir.patch b/mariadb-pcdir.patch
deleted file mode 100644
index 117273a..0000000
--- a/mariadb-pcdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Use PCDIR CMake option, if configured
-
-Upstream install the server pkgconfig file into arch-independent directory
-Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340
-
---- mariadb-10.5.5/support-files/CMakeLists.txt.old	2020-09-30 10:36:08.582490318 +0200
-+++ mariadb-10.5.5/support-files/CMakeLists.txt	2020-09-30 10:38:58.079710848 +0200
-@@ -91,7 +91,11 @@
-   ENDIF()
- 
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
-+IF(INSTALL_PCDIR)
-+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)
-+ELSE()
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
-+ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-   
diff --git a/mariadb.spec b/mariadb.spec
index a29f0f5..afef4cd 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -209,8 +209,6 @@ Patch7:           %{pkgnamepatch}-scripts.patch
 Patch9:           %{pkgnamepatch}-ownsetup.patch
 #   Patch10: Fix cipher name in the SSL Cipher name test
 Patch10:          %{pkgnamepatch}-ssl-cipher-tests.patch
-#   Patch11: Use PCDIR CMake option, if configured
-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
@@ -743,7 +741,6 @@ rm -r storage/rocksdb/
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 %if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
 %patch12 -p1
 %patch16 -p1
@@ -833,7 +830,6 @@ fi
          -DINSTALL_SBINDIR=libexec \
          -DINSTALL_SCRIPTDIR=bin \
          -DINSTALL_SUPPORTFILESDIR=share/%{pkg_name} \
-         -DINSTALL_PCDIR=%{_lib}/pkgconfig \
          -DMYSQL_DATADIR="%{dbdatadir}" \
          -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
          -DTMPDIR=/var/tmp \