remove patch1 because of build error

(cherry picked from commit 347cbccd076fb4fbdca876e8de5e3578a0742552)
This commit is contained in:
yangzhao_kl 2021-08-26 12:02:22 +08:00 committed by openeuler-sync-bot
parent a9e6a26b6c
commit bac6c03304
2 changed files with 4 additions and 26 deletions

View File

@ -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 <mysql.h>
+#include <server/mysql.h>
#include <mysqld_error.h>
#include <errmsg.h>
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 <mysql.h>
+#include <server/mysql.h>
#include <errmsg.h>
char *db_user = NULL;

View File

@ -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 <yangzhao1@kylinos.cn> - 2.3.3-3
- remove patch1 because of build error
* Mon Feb 22 2021 yangzhao <yangzhao1@kylinos.cn> - 2.3.3-2
- replace libpq-devel with postgresql-devel