diff options
author | Damian Myerscough <Damian.Myerscough@gmail.com> | 2013-12-16 18:15:46 -0800 |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2013-12-17 21:33:10 +0100 |
commit | aaee2c06329a9afac9f5e9d626957fe258615fa8 (patch) | |
tree | 2ecf0ac471e819ceb47ec63d935e361282ff19e5 | |
parent | c91ff7539af65f95c2bcef69e5643bd99773c80f (diff) | |
download | monitoring-plugins-aaee2c06329a9afac9f5e9d626957fe258615fa8.tar.gz |
Fix #1217 spec file fails to build due to duplicate files and unused files
-rw-r--r-- | nagios-plugins.spec.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nagios-plugins.spec.in b/nagios-plugins.spec.in index 4b4b7d0f..31f7a8b9 100644 --- a/nagios-plugins.spec.in +++ b/nagios-plugins.spec.in | |||
@@ -163,8 +163,6 @@ fi | |||
163 | %install | 163 | %install |
164 | rm -rf $RPM_BUILD_ROOT | 164 | rm -rf $RPM_BUILD_ROOT |
165 | make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install | 165 | make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install |
166 | build-aux/install-sh -c -d ${RPM_BUILD_ROOT}%{_sysconfdir} | ||
167 | build-aux/install-sh -c -m 664 command.cfg ${RPM_BUILD_ROOT}%{_sysconfdir} | ||
168 | %find_lang %{name} | 166 | %find_lang %{name} |
169 | echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang | 167 | echo "%defattr(755,%{npusr},%{npgrp})" >> %{name}.lang |
170 | 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 | 168 | 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 | |||
174 | 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 | 172 | 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 |
175 | echo "%{_libexecdir}/utils.pm" >> %{name}.lang | 173 | echo "%{_libexecdir}/utils.pm" >> %{name}.lang |
176 | echo "%{_libexecdir}/utils.sh" >> %{name}.lang | 174 | echo "%{_libexecdir}/utils.sh" >> %{name}.lang |
175 | echo "%{_libexecdir}/check_ldaps" >> %{name}.lang | ||
176 | |||
177 | sed -i '/libnpcommon/d' %{name}.lang | ||
178 | sed -i '/nagios-plugins.mo/d' %{name}.lang | ||
177 | 179 | ||
178 | %clean | 180 | %clean |
179 | rm -rf $RPM_BUILD_ROOT | 181 | rm -rf $RPM_BUILD_ROOT |