1
0

Accepting request 495700 from server:monitoring

1

OBS-URL: https://build.opensuse.org/request/show/495700
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins?expand=0&rev=6
This commit is contained in:
Lars Vogdt 2017-05-17 21:55:27 +00:00 committed by Git OBS Bridge
commit 3ca3475b32
2 changed files with 19 additions and 16 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 28 18:18:50 UTC 2017 - jengelh@inai.de
- Replace %__-type macro indirections. Drop %clean, replace
-exec \; by -exec +.
-------------------------------------------------------------------
Fri Apr 21 15:25:57 CEST 2017 - ro@suse.de

View File

@ -1068,18 +1068,18 @@ it will provide the size of the queue of age of queue.
%prep
%setup -q
%if 0%{?suse_version}
%{__mkdir_p} example/permissions.d
%{__cp} %{S:11} example/permissions.d/%{name}
mkdir -p example/permissions.d
cp %{S:11} example/permissions.d/%{name}
%endif
%{__cp} %{S:12} ./README.SUSE
%{__cp} %{S:13} ./README.SUSE-check_dhcp
%{__cp} %{S:14} ./README.SUSE-check_icmp
%{__cp} %{S:15} ./README.SUSE-check_ide_smart
%{__cp} %{S:20} ./README.SUSE-check_cups
cp %{S:12} ./README.SUSE
cp %{S:13} ./README.SUSE-check_dhcp
cp %{S:14} ./README.SUSE-check_icmp
cp %{S:15} ./README.SUSE-check_ide_smart
cp %{S:20} ./README.SUSE-check_cups
rm plugins-scripts/check_ircd.pl
install -m0644 %{S:26} plugins-scripts/check_ircd.pl
%{__cp} %{S:28} ./README.SUSE-check_ping
%{__cp} %{S:29} ./README.SUSE-check_ntp_time
cp %{S:28} ./README.SUSE-check_ping
cp %{S:29} ./README.SUSE-check_ntp_time
for extension in mysql pgsql sqlite3 ; do
cat >> README.SUSE-dbi-$extension << EOF
@ -1099,7 +1099,7 @@ done
# Debian patches
%patch116 -p1
%patch118 -p1
find -type f -exec %{__chmod} 644 {} \;
find -type f -exec chmod 644 {} +
%build
export CFLAGS="%{optflags} -fno-strict-aliasing -DLDAP_DEPRECATED"
@ -1138,8 +1138,8 @@ make all %{?_smp_mflags}
%install
sed -i 's,^MKINSTALLDIRS.*,MKINSTALLDIRS = ../mkinstalldirs,' po/Makefile
%makeinstall install-root
%{__install} -m 0755 %{S:18} %{buildroot}%{nagios_plugindir}/check_cups
%make_install install-root
install -m 0755 %{S:18} %{buildroot}%{nagios_plugindir}/check_cups
# provide check_host and check_rta_multi as on Debian
if [ -x %{buildroot}%{nagios_plugindir}/check_icmp ] ; then
test -f %{buildroot}%{nagios_plugindir}/check_host && rm -f %{buildroot}%{nagios_plugindir}/check_host
@ -1162,7 +1162,7 @@ done
popd
# check_sensors makes no sense on some archs
%ifarch ppc ppc64 sparc sparc64 s390 s390x
%{__rm} -f %{buildroot}%{nagios_plugindir}/check_sensors
rm -f %{buildroot}/%{nagios_plugindir}/check_sensors
%endif
# provie procs_perf symlink for compatibility
ln -s %{nagios_plugindir}/check_procs %{buildroot}%{nagios_plugindir}/check_procs_perf
@ -1203,9 +1203,6 @@ touch %{buildroot}%{_sysconfdir}/%{name}/%{name}.ini
# find locale files
%find_lang %{name}
%clean
%{__rm} -rf %{buildroot}
%if 0%{?suse_version}
%post dhcp
# in case somebody uses the permissions file we provide