[nagios-plugins] Fix #1217 spec file fails to build due to ...
Git Repository
git at nagios-plugins.org
Tue Dec 17 21:40:06 CET 2013
Module: nagios-plugins
Branch: maint
Commit: aaee2c06329a9afac9f5e9d626957fe258615fa8
Author: Damian Myerscough <Damian.Myerscough at gmail.com>
Committer: Holger Weiss <holger at zedat.fu-berlin.de>
Date: Mon Dec 16 18:15:46 2013 -0800
URL: https://www.nagios-plugins.org/repositories/nagios-plugins/commit/?id=aaee2c0
Fix #1217 spec file fails to build due to duplicate files and unused files
---
nagios-plugins.spec.in | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/nagios-plugins.spec.in b/nagios-plugins.spec.in
index 4b4b7d0..31f7a8b 100644
--- a/nagios-plugins.spec.in
+++ b/nagios-plugins.spec.in
@@ -163,8 +163,6 @@ fi
%install
rm -rf $RPM_BUILD_ROOT
make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install
-build-aux/install-sh -c -d ${RPM_BUILD_ROOT}%{_sysconfdir}
-build-aux/install-sh -c -m 664 command.cfg ${RPM_BUILD_ROOT}%{_sysconfdir}
%find_lang %{name}
echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang
comm -13 %{npdir}/ls-plugins-before %{npdir}/ls-plugins-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
@@ -174,6 +172,10 @@ echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang
comm -13 %{npdir}/ls-plugins-scripts-before %{npdir}/ls-plugins-scripts-after | egrep -v "\.o$|^\." | gawk -v libexecdir=%{_libexecdir} '{printf( "%s/%s\n", libexecdir, $0);}' >> %{name}.lang
echo "%{_libexecdir}/utils.pm" >> %{name}.lang
echo "%{_libexecdir}/utils.sh" >> %{name}.lang
+echo "%{_libexecdir}/check_ldaps" >> %{name}.lang
+
+sed -i '/libnpcommon/d' %{name}.lang
+sed -i '/nagios-plugins.mo/d' %{name}.lang
%clean
rm -rf $RPM_BUILD_ROOT
More information about the Commits
mailing list