[shinken/el6] fix file.
david hannequin
hvad at fedoraproject.org
Sat Mar 9 21:21:20 UTC 2013
commit 69d063f5a8e76a779c82b6831b216b876ee5a138
Author: hvad <david.hannequin at gmail.com>
Date: Sat Mar 9 22:20:56 2013 +0100
fix file.
shinken-webui-menu.patch | 12 ++++++------
shinken.spec | 10 ++++++++--
2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/shinken-webui-menu.patch b/shinken-webui-menu.patch
index 6a8d056..521a94f 100644
--- a/shinken-webui-menu.patch
+++ b/shinken-webui-menu.patch
@@ -1,6 +1,6 @@
-diff -up shinken-1.2.2/shinken/webui/views/header_element.tpl.orig shinken-1.2.2/shinken/webui/views/header_element.tpl
---- shinken-1.2.2/shinken/webui/views/header_element.tpl.orig 2012-12-16 15:37:52.136322431 +0100
-+++ shinken-1.2.2/shinken/webui/views/header_element.tpl 2012-12-16 16:11:03.107927977 +0100
+diff -up shinken-1.2.4/shinken/webui/views/header_element.tpl.orig shinken-1.2.4/shinken/webui/views/header_element.tpl
+--- shinken-1.2.4/shinken/webui/views/header_element.tpl.orig 2013-03-09 20:28:32.853973497 +0100
++++ shinken-1.2.4/shinken/webui/views/header_element.tpl 2013-03-09 20:31:00.875259088 +0100
@@ -10,26 +10,6 @@
</a>
@@ -8,9 +8,9 @@ diff -up shinken-1.2.2/shinken/webui/views/header_element.tpl.orig shinken-1.2.2
- <ul class="nav">
- <li class="dropdown">
- <a href="#" class="dropdown-toggle brand" data-toggle="dropdown" style="color: #FFFFFF"> Shinken <b class="caret"></b></a>
-- <ul class="dropdown-menu span4">
+- <ul class="dropdown-menu">
- <li><a href=":7767">Shinken UI </a></li>
-- <li><a href=":7766">Skonf UI</a></li>
+- <li><a href=":7766">Skonf UI</a><span class="badger-beta badger-critical">Beta</span></li>
- <!-- We will add also others UIs on the global menu -->
- %if app:
- %other_uis = app.get_external_ui_link()
@@ -28,7 +28,7 @@ diff -up shinken-1.2.2/shinken/webui/views/header_element.tpl.orig shinken-1.2.2
<ul class="nav">
%menu = [ ('/dashboard', 'Dashboard'), ('/impacts','Impacts'), ('/problems','IT problems'), ('/all', 'All'), ('/wall', 'Wall')]
-@@ -115,4 +95,4 @@
+@@ -113,4 +93,4 @@
</div><!--/.nav-collapse -->
</div>
</div>
diff --git a/shinken.spec b/shinken.spec
index 5a14241..100a31e 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -5,10 +5,11 @@
Summary: Python Monitoring tool
Name: shinken
Version: 1.2.4
-Release: 2%{?dist}
+Release: 5%{?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
@@ -92,6 +93,8 @@ Shinken receiver daemon
%setup -q
+%patch0 -p1 -b .patch
+
# clean git files/
find . -name '.gitignore' -exec rm -f {} \;
@@ -526,8 +529,11 @@ fi
%attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
%changelog
+* Sat Mar 9 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-5
+- Add Webui menu patch.
+
* Wed Mar 6 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-2
-- update from upstream.
+- Fix discovery rules.
* Sun Feb 24 2013 David Hannequin <david.hannequin at gmail.com> - 1.2.4-1
- Update from upstream.
More information about the scm-commits
mailing list