[shinken/el6] new spec file and new source

david hannequin hvad at fedoraproject.org
Fri May 31 11:44:01 UTC 2013


commit 9f684e213255d4b89dcbd54807c838a7282adc1e
Author: hvad <david.hannequin at gmail.com>
Date:   Fri May 31 13:43:48 2013 +0200

    new spec file and new source

 .gitignore   |    1 +
 shinken.spec |   18 ++++++++++--------
 sources      |    2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27a8954..94881fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /shinken-1.2.2.tar.gz
 /shinken-1.2.3.tar.gz
 /shinken-1.2.4.tar.gz
+/shinken-1.4.tar.gz
diff --git a/shinken.spec b/shinken.spec
index 47c3a57..31af9e1 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -4,12 +4,11 @@
 
 Summary:        Python Monitoring tool
 Name:           shinken
-Version:        1.2.4
-Release:        6%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 URL:            http://www.%{name}-monitoring.org
 Source0:        http://www.%{name}-monitoring.org/pub/%{name}-%{version}.tar.gz
 Source1:        %{name}-commands.cfg
-Patch0:         %{name}-webui-menu.patch
 License:        AGPLv3+
 Requires:       python 
 Requires:       python-pyro 
@@ -93,7 +92,6 @@ Shinken receiver daemon
 
 %setup -q
 
-%patch0 -p1 -b .patch 
 
 # clean git files/
 find . -name '.gitignore' -exec rm -f {} \;
@@ -102,7 +100,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 etc/packs/trending
+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 shinken/modules/glances_ui/plugins/cv_memory/htdocs/js/memory.js 
 
 %build
 
@@ -190,7 +188,8 @@ for Files in %{buildroot}%{python_sitelib}/%{name}/__init__.py %{buildroot}%{pyt
   %{__rm} ${Files}.orig
 done
 
-
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/font-awesome-ie7.min.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/font-awesome.min.css
 chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/shinken-greeting.js
 chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/views/log.tpl
 chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/login/htdocs/css/login.css
@@ -509,9 +508,9 @@ fi
 %files
 %{python_sitelib}/%{name}
 %if %{with_systemd}
-%{python_sitelib}/Shinken-1.2.4-py2.7.egg-info
+%{python_sitelib}/Shinken-1.4-py2.7.egg-info
 %else
-%{python_sitelib}/Shinken-1.2.4-py2.6.egg-info
+%{python_sitelib}/Shinken-1.4-py2.6.egg-info
 %endif
 %{_sbindir}/%{name}-receiver*
 %{_sbindir}/%{name}-discovery
@@ -529,6 +528,9 @@ fi
 %attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
 
 %changelog
+* Wed May 27 2013 David Hannequin <david.hannequin at gmail.com> - 1.4-1
+- Update from upstream.
+
 * Mon Mar 11 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-6
 - Fix broker summary.
 
diff --git a/sources b/sources
index 0836475..52a1908 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f674ee59a627342925d79b36a143a488  shinken-1.2.4.tar.gz
+67f6b759701b04691353be7e949a90f3  shinken-1.4.tar.gz


More information about the scm-commits mailing list