Logoj0ke.net Open Build Service > Projects > home:netmax > nagios-plugins > Changes
Sign Up | Log In

Changes of Revision 67

[-] Changed nagios-plugins.changes
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Fri Oct 11 17:59:10 UTC 2019 - Local OBS User <cs@linux-administrator.com>
4
+
5
+- update to pre-release (git) 2.2.2 ported from EPEL
6
+
7
+-------------------------------------------------------------------
8
 Fri Jun 30 06:06:28 UTC 2017 - cs@linux-administrator.com
9
10
 - update to release 2.2.1
11
​
[-] Changed nagios-plugins.spec ^
83
 
1
@@ -1,18 +1,41 @@
2
 #!BuildIgnore:          post-build-checks
3
+
4
+%global commit 1b8ad572ea5480f9f611cf7321feb10f176fdb84
5
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
6
+%global commdate 20190926
7
+
8
+%global gitbuild 1
9
+
10
 %define pkgname    nagios-plugins
11
 Name:      nagios-plugins
12
-Version:   2.2.1
13
+Version:   2.2.2
14
+%if 0%{?gitbuild:1}
15
+Release:   35.%{?commdate}git%{?shortcommit}%{?dist}
16
+%else
17
 Release:   35
18
+%endif
19
 Summary:   Host/service/network monitoring program plugins for Nagios
20
21
 Group:     Applications/System
22
 License:   GPL
23
 URL:       https://www.nagios-plugins.org/
24
+%if 0%{?gitbuild:1}
25
+Source0: https://github.com/nagios-plugins/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
26
+%else
27
 Source0:   %{pkgname}-%{version}.tar.bz2
28
+%endif
29
+
30
 Source1:   %{name}-rpmlintrc
31
-#Patch100: nagios-plugins_DISABLE-SMARTENABLE.patch
32
+%if 0%{?gitbuild:1}
33
+Patch1: nagios-plugins-0001-Fix-mysql-f27.patch
34
+Patch2: nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch
35
+Patch7: nagios-plugins-0007-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch
36
+Patch10: nagios-plugins-0010-include-mysql-version-header.patch
37
+Patch11: nagios-plugins-0011-fix-perl-shebang.patch
38
+Patch12: nagios-plugins-0012-fix-perl-ntp-ipv6.patch
39
+%else
40
 Patch200:  revert-check_mailq-autodetect-2.2.1.diff
41
-#Patch201: nagios-plugins-2.0.2_dnsfix.patch
42
+%endif
43
44
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
45
46
@@ -73,6 +96,11 @@
47
 Requires: samba-client
48
 %endif
49
50
+# this is disabled in our build to have other packages require the utils.pm from nagios-plugins
51
+# Do not provide private Perl modules
52
+#%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(utils\\)
53
+#%global reqfilt sh -c "%{__perl_requires} | sed -e 's!perl(utils)!nagios-plugins-perl!'"
54
+#%global __perl_requires %{reqfilt}
55
56
57
 %description
58
@@ -86,10 +114,22 @@
59
60
61
 %prep
62
+%if 0%{?gitbuild:1}
63
+%setup -q -n %{name}-%{commit}
64
+%if 0%{?fedora} >26
65
+%patch1 -p1 -b .fix_mysql
66
+%endif
67
+%patch2 -p1 -b .remove_ntp_jitter
68
+%patch7 -p1 -b .fix_ntpcommands
69
+%if 0%{?rhel} > 7
70
+%patch10 -p1 -b .mysqlversionh
71
+%endif
72
+%patch11 -p1 -b .fix_perl_shebang
73
+%patch12 -p1 -b .fix_perl_ntp
74
+%else
75
 %setup -q -n %{pkgname}-%{version}
76
-##%patch100
77
 %patch200 -p1
78
-##%patch201 -p1
79
+%endif
80
81
 %build
82
 ./configure \
83
​
[+] Added nagios-plugins-0001-Fix-mysql-f27.patch ^
[+] Added nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch ^
[+] Added nagios-plugins-0007-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch ^
[+] Added nagios-plugins-0010-include-mysql-version-header.patch ^
[+] Added nagios-plugins-0011-fix-perl-shebang.patch ^
[+] Added nagios-plugins-0012-fix-perl-ntp-ipv6.patch ^
Added nagios-plugins-1b8ad57.tar.gz ^

Cancel