From bac6c03304a74fd8ffad853535fcea00478ea2de Mon Sep 17 00:00:00 2001 From: yangzhao_kl Date: Thu, 26 Aug 2021 12:02:22 +0800 Subject: [PATCH] remove patch1 because of build error (cherry picked from commit 347cbccd076fb4fbdca876e8de5e3578a0742552) --- nagios-plugins-0001-Fix-mysql-f27.patch | 24 ------------------------ nagios-plugins.spec | 6 ++++-- 2 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 nagios-plugins-0001-Fix-mysql-f27.patch diff --git a/nagios-plugins-0001-Fix-mysql-f27.patch b/nagios-plugins-0001-Fix-mysql-f27.patch deleted file mode 100644 index 34926a7..0000000 --- a/nagios-plugins-0001-Fix-mysql-f27.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ./plugins/check_mysql.c.fix_mysql_f27 ./plugins/check_mysql.c ---- ./plugins/check_mysql.c.fix_mysql_f27 2017-11-20 21:19:47.597527944 -0500 -+++ ./plugins/check_mysql.c 2017-11-20 21:17:15.715921194 -0500 -@@ -41,7 +41,7 @@ const char *email = "devel@nagios-plugin - #include "utils_base.h" - #include "netutils.h" - --#include -+#include - #include - #include - -diff -up ./plugins/check_mysql_query.c.fix_mysql_f27 ./plugins/check_mysql_query.c ---- ./plugins/check_mysql_query.c.fix_mysql_f27 2017-11-20 21:20:01.369764323 -0500 -+++ ./plugins/check_mysql_query.c 2017-11-20 21:17:20.378001200 -0500 -@@ -38,7 +38,7 @@ const char *email = "devel@nagios-plugin - #include "utils_base.h" - #include "netutils.h" - --#include -+#include - #include - - char *db_user = NULL; diff --git a/nagios-plugins.spec b/nagios-plugins.spec index 8b7a284..72b0dc3 100644 --- a/nagios-plugins.spec +++ b/nagios-plugins.spec @@ -2,14 +2,13 @@ Name: nagios-plugins Version: 2.3.3 -Release: 2 +Release: 3 Summary: Host/service/network monitoring program plugins for Nagios License: GPLv2 and MIT and GPLv3 and LGPLv2 and GPL URL: https://www.nagios-plugins.org/ Source0: https://github.com/nagios-plugins/nagios-plugins/releases/download/release-%{version}/%{name}-%{version}.tar.gz -Patch1: nagios-plugins-0001-Fix-mysql-f27.patch Patch2: nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch Patch3: nagios-plugins-0003-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch @@ -724,6 +723,9 @@ chmod 644 %{buildroot}/%{_libdir}/nagios/plugins/utils.pm %{_libdir}/nagios/plugins/check_wave %changelog +* Thu Aug 26 2021 yangzhao - 2.3.3-3 +- remove patch1 because of build error + * Mon Feb 22 2021 yangzhao - 2.3.3-2 - replace libpq-devel with postgresql-devel