From 75785df7d638e98d44a9d96d6b704b866e492f37 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Fri, 18 Jul 2014 14:28:47 +0200
Subject: [PATCH] Use modern symbol filtering with compatible backup

---
 filter-requires-mysql.sh |  5 -----
 mariadb.spec             | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100755 filter-requires-mysql.sh

diff --git a/filter-requires-mysql.sh b/filter-requires-mysql.sh
deleted file mode 100755
index bce04c6..0000000
--- a/filter-requires-mysql.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/perl.req $* | \
-    grep -v -e "perl(th" \
-    -e "perl(lib::mtr" -e "perl(lib::v1/mtr" -e "perl(mtr"
diff --git a/mariadb.spec b/mariadb.spec
index d586a49..6b16a82 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -80,8 +80,6 @@ Source51: rh-skipped-tests-intel.list
 Source52: rh-skipped-tests-arm.list
 Source53: rh-skipped-tests-ppc-s390.list
 Source54: rh-skipped-tests-ppc64le.list
-# Working around perl dependency checking bug in rpm FTTB. Remove later.
-Source999: filter-requires-mysql.sh
 
 # Comments for these patches are in the patch files.
 Patch1: mariadb-errno.patch
@@ -126,9 +124,15 @@ Provides: mysql = %{epoch}:%{version}-%{release}
 Provides: mysql%{?_isa} = %{epoch}:%{version}-%{release}
 %{?obsoleted_mysql_evr:Obsoletes: mysql < %{obsoleted_mysql_evr}}
 
-# When rpm 4.9 is universal, this could be cleaned up:
-%global __perl_requires %{SOURCE999}
-%global __perllib_requires %{SOURCE999}
+# Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
+%if 0%{?__requires_exclude:1}
+%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::)
+%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
+%else
+%filter_from_requires /perl(\(hostnames\|lib::mtr\|lib::v1\|mtr_\|My::\)/d
+%filter_provides_in -P (%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
+%filter_setup 
+%endif
 
 # By default, patch(1) creates backup files when chunks apply with offsets.
 # Turn that off to ensure such files don't get included in RPMs (cf bz#884755).
@@ -848,6 +852,7 @@ fi
 - Removed obsolete mysql-cluster, the package should already be removed
 - Improve error message when log file is not writable
 - Compile all binaries with full RELRO (RHBZ#1092548)
+- Use modern symbol filtering with compatible backup
 
 * Wed Jun 18 2014 Mikko Tiihonen <mikko.tiihonen@iki.fi> - 1:10.0.12-2
 - Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9