From bfbe4efc59dfdfbb82cdd4d3b11f29b0ebe2d438 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Wed, 29 Nov 2023 23:57:06 +0100 Subject: [PATCH] [19/20] SPECfile cleanup - move general code blocks to a more logical place --- mariadb.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index a07820e..6e21810 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -14,6 +14,13 @@ # Set to 1 to force run the testsuite even if it was already tested in current version %global force_run_testsuite 0 +# Filtering: https://docs.fedoraproject.org/en-US/packaging-guidelines/AutoProvidesAndRequiresFiltering/ +%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::|wsrep) +%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/%{pkg_name}/plugin/.*\\.so)$ + +# Define license macro if not present +%{!?_licensedir:%global license %doc} + # Temporary workaround to fix the "internal compiler error" described in https://bugzilla.redhat.com/show_bug.cgi?id=2239498 # TODO: Remove when the issue is resolved %ifarch i686 @@ -281,13 +288,6 @@ Suggests: %{name}-server%{?_isa} = %{sameevr} Conflicts: %{?fedora:community-}mysql -# Filtering: https://docs.fedoraproject.org/en-US/packaging-guidelines/AutoProvidesAndRequiresFiltering/ -%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::|wsrep) -%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/%{pkg_name}/plugin/.*\\.so)$ - -# Define license macro if not present -%{!?_licensedir:%global license %doc} - %description MariaDB is a community developed fork from MySQL - a multi-user, multi-threaded SQL database server. It is a client/server implementation consisting of