Logoj0ke.net Open Build Service > Projects > server:database:percona > nagios-plugins > Changes
Sign Up | Log In

Changes of Revision 2

[-] Changed nagios-plugins.spec
x
 
1
@@ -1,51 +1,18 @@
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 0
9
-
10
-%define pkgname    nagios-plugins
11
 Name:      nagios-plugins
12
-Version:   2.4.9
13
-%if 0%{?gitbuild:1}
14
-Release:   35.%{?commdate}git%{?shortcommit}%{?dist}
15
-%else
16
-Release:   35
17
-%endif
18
+Version:   1.4.14
19
+Release:   25
20
 Summary:   Host/service/network monitoring program plugins for Nagios
21
 
22
 Group:     Applications/System
23
 License:   GPL
24
-URL:       https://www.nagios-plugins.org/
25
-%if 0%{?gitbuild:1}
26
-Source0: https://github.com/nagios-plugins/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
27
-%else
28
-Source0:   %{pkgname}-%{version}.tar.bz2
29
-%endif
30
-
31
+URL:       http://nagiosplug.sourceforge.net/
32
+Source0:   http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.bz2
33
 Source1:   %{name}-rpmlintrc
34
-%if 0%{?gitbuild:1}
35
-Patch1: nagios-plugins-0001-Fix-mysql-f27.patch
36
-Patch2: nagios-plugins-0002-Remove-assignment-of-not-parsed-to-jitter.patch
37
-Patch7: nagios-plugins-0007-Fix-the-use-lib-statement-and-the-external-ntp-comma.patch
38
-Patch10: nagios-plugins-0010-include-mysql-version-header.patch
39
-Patch11: nagios-plugins-0011-fix-perl-shebang.patch
40
-Patch12: nagios-plugins-0012-fix-perl-ntp-ipv6.patch
41
-%else
42
-Patch200:  revert-check_mailq-autodetect-2.4.0.diff
43
-%endif
44
-
45
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
46
 
47
 Prefix: %{_prefix}/lib/nagios/plugins
48
 PreReq:    sed
49
-Provides:  monitoring-plugins-%{version}-%{release}
50
-Provides:  nagios-plugins-perl-%{version}-%{release}
51
-Obsoletes: nagios-plugins-perl
52
-Provides:  monitoring-plugins-perl-%{version}-%{release}
53
-Obsoletes: monitoring-plugins-perl
54
 
55
 %{!?custom:%global custom 0}
56
 Obsoletes: nagios-plugins-custom nagios-plugins-extras
57
@@ -61,51 +28,15 @@
58
 %endif
59
 
60
 %if 0%{?suse_version}
61
-%if 0%{?suse_version} > 1310
62
-BuildRequires:  libsmbclient0
63
-%else
64
-BuildRequires: libsmbclient qstat
65
-%endif
66
-BuildRequires: tcpd-devel libsmbclient-devel openldap2-devel perl-Net-SNMP fping glibc bind-utils
67
-%if 0%{?suse_version} > 1030
68
-BuildRequires: freeradius-client-devel freeradius-server-devel
69
-%else
70
-BuildRequires:  freeradius-devel
71
-%endif
72
-%endif
73
-
74
-
75
-
76
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?redhat_version} || 0%{?sl_version}
77
-%if 0%{?rhel} == 8
78
-BuildRequires: openldap-devel freeradius samba-common openldap-devel glibc-common qstat which
79
-%else
80
-BuildRequires:  tcp_wrappers openldap-devel freeradius samba-common openldap-devel net-snmp-perl glibc-common qstat which
81
-%endif
82
-%endif
83
-
84
-
85
-# fping is in EPEL for EL
86
-BuildRequires: openssl-devel postgresql-devel mysql-devel zlib-devel glibc-devel gcc gcc-c++ net-snmp net-snmp-devel openssh iputils samba-client procps fping 
87
-
88
-%if 0%{?suse_version} <= 1310
89
-Requires: iputils qstat
90
-%else
91
-Requires: iputils
92
+BuildRequires: tcpd-devel libsmbclient libsmbclient-devel openldap2-devel perl-Net-SNMP fping glibc bind-utils
93
 %endif
94
 
95
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?redhat_version} || 0%{?sl_version}
96
-Requires: /usr/bin/smbclient
97
-%else
98
-Requires: samba-client
99
+%if 0%{?fedora_version} || 0%{?centos_version}
100
+BuildRequires:  tcp_wrappers openldap-devel freeradius samba-common openldap-devel net-snmp-perl glibc-common
101
 %endif
102
 
103
-# this is disabled in our build to have other packages require the utils.pm from nagios-plugins
104
-# Do not provide private Perl modules
105
-# global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(utils\\)
106
-# global reqfilt sh -c "%{__perl_requires} | sed -e 's!perl(utils)!nagios-plugins-perl!'"
107
-# global __perl_requires %{reqfilt}
108
-
109
+BuildRequires: openssl-devel postgresql-devel Percona-Server-devel zlib-devel glibc-devel libgcc gcc gcc-c++ net-snmp net-snmp-devel openssh qstat iputils samba-client procps
110
+Requires: qstat iputils samba-client
111
 
112
 %description
113
 Nagios is a program that will monitor hosts and services on your
114
@@ -118,41 +49,15 @@
115
 
116
 
117
 %prep
118
-%if 0%{?gitbuild:1}
119
-%setup -q -n %{name}-%{commit}
120
-%if 0%{?fedora} >26
121
-%patch1 -p1 -b .fix_mysql
122
-%endif
123
-%patch2 -p1 -b .remove_ntp_jitter
124
-%patch7 -p1 -b .fix_ntpcommands
125
-%if 0%{?rhel} > 7
126
-%patch10 -p1 -b .mysqlversionh
127
-%endif
128
-%patch11 -p1 -b .fix_perl_shebang
129
-%patch12 -p1 -b .fix_perl_ntp
130
-%else
131
-%setup -q -n %{pkgname}-%{version}
132
-%patch200 -p1
133
-%endif
134
+%setup -q
135
 
136
 %build
137
-%if 0%{?gitbuild:1}
138
-./tools/setup
139
-%endif
140
 ./configure \
141
 --prefix=%{_prefix} \
142
 --exec-prefix=%{_prefix} \
143
 --libexecdir=%{_prefix}/lib/nagios/plugins \
144
 --sysconfdir=%{_sysconfdir}/nagios \
145
 --datadir=%{_datadir} \
146
---with-perl=/usr/bin/perl \
147
-%if 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700 || 0%{?rhel} >= 7 || 0%{?sl_version} >= 700
148
---with-ping-command="/bin/ping -n -U -w %d -c %d %s" \
149
-%endif
150
---with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" \
151
---with-fping-command=%{_sbindir}/fping \
152
---with-fping6-command=%{_sbindir}/fping6 \
153
---with-ipv6 \
154
 --with-cgiurl=/nagios/cgi-bin \
155
 --with-rpcinfo-command=%{_sbindir}/rpcinfo \
156
 --with-mailq-command=%{_bindir}/mailq \
157
@@ -163,56 +68,32 @@
158
 %install
159
 rm -rf $RPM_BUILD_ROOT
160
 %__make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install-strip
161
-%__make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install-root
162
 %__install -d ${RPM_BUILD_ROOT}/etc/nagios
163
-##__install -m 664 command.cfg ${RPM_BUILD_ROOT}/etc/nagios
164
-##%find_lang %{name}
165
+%__install -m 664 command.cfg ${RPM_BUILD_ROOT}/etc/nagios
166
+%find_lang %{name}
167
 # fix lib path in perl plugins
168
 cd ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/plugins
169
-# set qmail-qstat if not found
170
-# fix lib path in perl plugins
171
-cd ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/plugins
172
-# set qmail-qstat if not found
173
-sed -i s@'$PATH_TO_QMAIL_QSTAT = "";'@'$PATH_TO_QMAIL_QSTAT = "/var/qmail/bin/qmail-qstat";'@ %{buildroot}%{_prefix}/lib/nagios/plugins/utils.pm
174
-sed -i s@"{'PATH'}='';"@"{'PATH'}='/usr/bin:/usr/sbin';"@ %{buildroot}%{_prefix}/lib/nagios/plugins/check_mailq 
175
+# not needed since 1.4.14
176
+#for PLUGIN in check_breeze check_disk_smb check_file_age check_flexlm check_ifoperstatus check_ifstatus check_ircd check_mailq check_rpc check_wave ; do
177
+# sed -i s@"nagios/plugins"@"%{_prefix}/lib/nagios/plugins"@g ${PLUGIN} 
178
+#done
179
 
180
 %clean
181
 rm -rf $RPM_BUILD_ROOT
182
 
183
-%post
184
-chmod 4711 %{_exec_prefix}/lib/nagios/plugins/check_icmp || :
185
-chmod 4711 %{_exec_prefix}/lib/nagios/plugins/check_dhcp || :
186
 
187
-##%files -f %{name}.lang
188
-%files
189
+%files -f %{name}.lang
190
 %defattr(-,root,root)
191
-##config(missingok,noreplace) /etc/nagios/command.cfg
192
-%doc CODING COPYING FAQ README REQUIREMENTS SUPPORT
193
-%if 0%{?gitbuild:0}
194
-%doc ChangeLog
195
-%endif
196
+%config(missingok,noreplace) /etc/nagios/command.cfg
197
+%doc CODING COPYING FAQ LEGAL README REQUIREMENTS SUPPORT THANKS
198
+%doc ChangeLog command.cfg
199
 %defattr(775,root,root)
200
 %dir %{_exec_prefix}/lib/nagios/plugins
201