[shinken/el6] New source and spec file.

Wed Mar 6 10:58:31 UTC 2013

commit 9e889ffeffebdb4babfc4c13d94427eb68332905
Author: hvad <david.hannequin at gmail.com>
Date:   Wed Mar 6 11:58:07 2013 +0100

    New source and spec file.

 .gitignore   |    1 +
 shinken.spec |   36 ++++++++++++++++++++----------------
 sources      |    2 +-
 3 files changed, 22 insertions(+), 17 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 63c2e8f..27a8954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /shinken-1.0.1.tar.gz
 /shinken-1.2.2.tar.gz
 /shinken-1.2.3.tar.gz
+/shinken-1.2.4.tar.gz
diff --git a/shinken.spec b/shinken.spec
index 06e7856..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
 
@@ -145,12 +145,12 @@ cp %{SOURCE1}  %{buildroot}%{_sysconfdir}/%{name}/commands.cfg
   install -p -m0644 for_fedora/systemd/%{name}-poller.service %{buildroot}%{_unitdir}/%{name}-poller.service
 %else
   install -d -m0755 %{buildroot}%{_initrddir}
-  install -p -m0644 for_fedora/init.d/%{name}-arbiter %{buildroot}%{_initrddir}/%{name}-arbiter
-  install -p -m0644 for_fedora/init.d/%{name}-scheduler %{buildroot}%{_initrddir}/%{name}-scheduler
-  install -p -m0644 for_fedora/init.d/%{name}-poller %{buildroot}%{_initrddir}/%{name}-poller
-  install -p -m0644 for_fedora/init.d/%{name}-broker %{buildroot}%{_initrddir}/%{name}-broker
-  install -p -m0644 for_fedora/init.d/%{name}-reactionner %{buildroot}%{_initrddir}/%{name}-reactionner
-  install -p -m0644 for_fedora/init.d/%{name}-receiver %{buildroot}%{_initrddir}/%{name}-receiver
+  install -p -m0644 for_fedora/init.d/%{name}-arbiter.init %{buildroot}%{_initrddir}/%{name}-arbiter
+  install -p -m0644 for_fedora/init.d/%{name}-scheduler.init %{buildroot}%{_initrddir}/%{name}-scheduler
+  install -p -m0644 for_fedora/init.d/%{name}-poller.init %{buildroot}%{_initrddir}/%{name}-poller
+  install -p -m0644 for_fedora/init.d/%{name}-broker.init %{buildroot}%{_initrddir}/%{name}-broker
+  install -p -m0644 for_fedora/init.d/%{name}-reactionner.init %{buildroot}%{_initrddir}/%{name}-reactionner
+  install -p -m0644 for_fedora/init.d/%{name}-receiver.init %{buildroot}%{_initrddir}/%{name}-receiver
 %endif
 
 install -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
@@ -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.
 
diff --git a/sources b/sources
index ce24db6..0836475 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eeb011a8c3f0d016086ee69ecd50e984  shinken-1.2.3.tar.gz
+f674ee59a627342925d79b36a143a488  shinken-1.2.4.tar.gz
