[shinken/f18] New spec file.

david hannequin hvad at fedoraproject.org
Wed Mar 6 10:17:18 UTC 2013


commit 75e34a0f3bc8a8e2761c0f575aac7ac15d2d82f9
Author: hvad <david.hannequin at gmail.com>
Date:   Wed Mar 6 11:16:10 2013 +0100

    New spec file.

 shinken.spec |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/shinken.spec b/shinken.spec
index 0d8396d..ffa3f6b 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -4,7 +4,7 @@
 
 Summary:        Python Monitoring tool
 Name:           shinken
-Version:        1.2.3
+Version:        1.2.4
 Release:        1%{?dist}
 URL:            http://www.%{name}-monitoring.org
 Source0:        http://www.%{name}-monitoring.org/pub/%{name}-%{version}.tar.gz
@@ -99,7 +99,7 @@ find . -name '.gitignore' -exec rm -f {} \;
 sed -i -e 's!./$SCRIPT!python ./$SCRIPT!' test/quick_tests.sh
 sed -i -e 's!include var/void_for_git!exclude var/void_for_git!'  MANIFEST.in
 
-rm -rf  shinken/webui/plugins/eue shinken/webui/plugins/mobile/htdocs/css/log.css shinken/webui/plugins/mobile/htdocs/css/system.css shinken/webui/plugins/mobile/htdocs/css/details.css etc/packs/os/collectd/discovery.cfg etc/packs/databases/mongodb/macros.cfg shinken/webui/plugins_skonf bin/shinken-skonf
+rm -rf  shinken/webui/plugins/eue shinken/webui/plugins/mobile/htdocs/css/log.css shinken/webui/plugins/mobile/htdocs/css/system.css shinken/webui/plugins/mobile/htdocs/css/details.css etc/packs/os/collectd/discovery.cfg etc/packs/databases/mongodb/macros.cfg shinken/webui/plugins_skonf bin/shinken-skonf etc/packs/trending
 
 %build
 
@@ -166,12 +166,15 @@ install -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name}
 mkdir -p %{buildroot}%{_localstatedir}/run/
 install -d -m0755 %{buildroot}%{_localstatedir}/run/%{name}
 
-install -d -m0755 %{buildroot}%{_usr}/lib/%{name}/plugins
-install  -m0755 libexec/*{.py,.pl} %{buildroot}%{_usr}/lib/%{name}/plugins
-
 install -d -m0755 %{buildroot}%{_mandir}/man3
 install -p -m0644 doc/man/* %{buildroot}%{_mandir}/man3
 
+install -d -m0755 %{buildroot}%{_usr}/lib/%{name}/plugins/discovery
+install  -m0755 libexec/*.py %{buildroot}%{_usr}/lib/%{name}/plugins
+install  -m0644 libexec/*.ini %{buildroot}%{_usr}/lib/%{name}/plugins
+install  -m0755 libexec/discovery/*.py %{buildroot}%{_usr}/lib/%{name}/plugins/discovery
+
+
 for lib in %{buildroot}%{python_sitearch}/%{name}/*.py; do
  sed '/\/usr\/bin\/env/d' $lib > $lib.new &&
  touch -r $lib $lib.new &&
@@ -242,7 +245,6 @@ chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/custom/badger.cs
 chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/navigation_element.tpl
 
 
-sed -i -e '1d;2i#!/usr/bin/env python' %{buildroot}%{_usr}/lib/%{name}/plugins/nsca_client.py
 sed -i -e 's!/usr/local/shinken/libexec!%{_libdir}/nagios/plugins!' %{buildroot}%{_sysconfdir}/%{name}/resource.cfg
 sed -i -e 's!/usr/lib/nagios/plugins!%{_libdir}/nagios/plugins!' %{buildroot}%{_sysconfdir}/%{name}/resource.cfg
 sed -i -e 's!/usr/local/shinken/var/arbiterd.pid!/var/run/shinken/arbiterd.pid!' %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg
@@ -255,7 +257,6 @@ sed -i -e 's!/usr/local/shinken/src/etc/!/etc/shinken/!' FROM_NAGIOS_TO_SHINKEN
 sed -i -e 's!(you can also be even more lazy and call the bin/launch_all.sh script).!!' FROM_NAGIOS_TO_SHINKEN
 
 rm -rf %{buildroot}%{_localstatedir}/{log,run,lib}/%{name}/void_for_git
-rm %{buildroot}%{_usr}/lib/%{name}/plugins/check.sh
 rm %{buildroot}%{_sysconfdir}/default/shinken
 rm -rf %{buildroot}%{_sysconfdir}/init.d/shinken*
 rm -rf %{buildroot}%{_usr}/lib/%{name}/plugins/*.{pyc,pyo}
@@ -505,18 +506,18 @@ fi
 %files
 %{python_sitelib}/%{name}
 %if %{with_systemd}
-%{python_sitelib}/Shinken-1.2.3-py2.7.egg-info
+%{python_sitelib}/Shinken-1.2.4-py2.7.egg-info
 %else
-%{python_sitelib}/Shinken-1.2.3-py2.6.egg-info
+%{python_sitelib}/Shinken-1.2.4-py2.6.egg-info
 %endif
 %{_sbindir}/%{name}-receiver*
 %{_sbindir}/%{name}-discovery
 %{_sbindir}/%{name}-admin
 %{_sbindir}/%{name}-hostd
 %{_sbindir}/%{name}-packs
+%{_usr}/lib/%{name}/plugins
 %doc etc/packs COPYING THANKS 
 %{_mandir}/man3/%{name}-*
-%{_usr}/lib/%{name}/plugins
 %config(noreplace) %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
@@ -525,6 +526,9 @@ fi
 %attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Sun Feb 24 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-1
+- update from upstream.
+
 * Wed Jan 30 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.3-1
 - update from upstream.
 


More information about the scm-commits mailing list