From 9cd2ebde7f2afb1d23df871f02bf46440d971307 Mon Sep 17 00:00:00 2001 From: linfeilong835 Date: Fri, 10 Jul 2020 09:26:00 +0800 Subject: [PATCH 1/4] update mariadb.spec. --- mariadb.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 0bf437d..e0f6456 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -2,7 +2,7 @@ Name: mariadb Version: 10.3.9 -Release: 9 +Release: 10 Epoch: 3 Summary: One of the most popular database servers License: GPLv2 with exceptions and LGPLv2 and BSD @@ -10,9 +10,9 @@ URL: http://mariadb.org Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz -Patch0001: disable-some-unstable-testcases.patch -Patch0002: add-install-db-command.patch -Patch0003: disable-some-unstable-testcases-2.patch +Patch0: 0000-disable-some-unstable-testcases.patch +Patch1: 0001-add-install-db-command.patch +Patch2: 0002-disable-some-unstable-testcases-2.patch BuildRequires: selinux-policy-devel, cmake, gcc-c++ BuildRequires: systemd, systemd-devel @@ -600,6 +600,9 @@ fi %changelog +* Fri Jul 10 2020 volcanodragon -3:10.3.9-10 +- Rename patch names + * Fri Jul 3 2020 jinzhimin -3:10.3.9-9 - Add conflict between mysql -- Gitee From b79f65f24d9a7757fd8e0f40dfabe757c108ac8e Mon Sep 17 00:00:00 2001 From: linfeilong835 Date: Fri, 10 Jul 2020 09:26:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20disable-some-?= =?UTF-8?q?unstable-testcases.patch=20=E4=B8=BA=200000-disable-some-unstab?= =?UTF-8?q?le-testcases.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...-testcases.patch => 0000-disable-some-unstable-testcases.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename disable-some-unstable-testcases.patch => 0000-disable-some-unstable-testcases.patch (100%) diff --git a/disable-some-unstable-testcases.patch b/0000-disable-some-unstable-testcases.patch similarity index 100% rename from disable-some-unstable-testcases.patch rename to 0000-disable-some-unstable-testcases.patch -- Gitee From d18d18e96b3312ffb1907bfc094f9898e5474b43 Mon Sep 17 00:00:00 2001 From: linfeilong835 Date: Fri, 10 Jul 2020 09:26:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20add-install-d?= =?UTF-8?q?b-command.patch=20=E4=B8=BA=200001-add-install-db-command.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- add-install-db-command.patch => 0001-add-install-db-command.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename add-install-db-command.patch => 0001-add-install-db-command.patch (100%) diff --git a/add-install-db-command.patch b/0001-add-install-db-command.patch similarity index 100% rename from add-install-db-command.patch rename to 0001-add-install-db-command.patch -- Gitee From b0c81e227d018a72dfda58e677b37a0ac04355d6 Mon Sep 17 00:00:00 2001 From: linfeilong835 Date: Fri, 10 Jul 2020 09:26:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20disable-some-?= =?UTF-8?q?unstable-testcases-2.patch=20=E4=B8=BA=200002-disable-some-unst?= =?UTF-8?q?able-testcases-2.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tcases-2.patch => 0002-disable-some-unstable-testcases-2.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename disable-some-unstable-testcases-2.patch => 0002-disable-some-unstable-testcases-2.patch (100%) diff --git a/disable-some-unstable-testcases-2.patch b/0002-disable-some-unstable-testcases-2.patch similarity index 100% rename from disable-some-unstable-testcases-2.patch rename to 0002-disable-some-unstable-testcases-2.patch -- Gitee