packages: nagios-nagstamon/nagios-nagstamon.spec, nagios-nagstamon/nagstamo...

[glen]

Author: glen                         Date: Fri Mar  9 08:11:38 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.9.8

---- Files affected:
packages/nagios-nagstamon:
   nagios-nagstamon.spec (1.4 -> 1.5) , nagstamon.desktop (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/nagios-nagstamon/nagios-nagstamon.spec
diff -u packages/nagios-nagstamon/nagios-nagstamon.spec:1.4 packages/nagios-nagstamon/nagios-nagstamon.spec:1.5
--- packages/nagios-nagstamon/nagios-nagstamon.spec:1.4	Fri Mar  9 08:51:05 2012
+++ packages/nagios-nagstamon/nagios-nagstamon.spec	Fri Mar  9 09:11:33 2012
@@ -1,43 +1,46 @@
 # $Revision$, $Date$
 Summary:	Nagios Status monitor for your Desktop
 Name:		nagios-nagstamon
-Version:	0.9.4
+Version:	0.9.8
 Release:	1
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://downloads.sourceforge.net/nagstamon/nagstamon_%{version}.tar.gz
-# Source0-md5:	52cd8bfc28086e29a84eccb607e9ce3c
+# Source0-md5:	792c85018a59345625171473b39d9865
 Source1:	nagstamon.desktop
-URL:		http://nagstamon.sourceforge.net/
+URL:		http://nagstamon.ifw-dresden.de/
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 # python-distribute for pkg_resources import
 Requires:	python-distribute
+Requires:	python-gnome-extras-egg
 Requires:	python-lxml
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Nagstamon is a Nagios status monitor for the desktop. It connects to
-multiple Nagios, Icinga, Opsview and Centreon monitoring servers and
-resides in systray or as a floating statusbar at the desktop showing a
-brief summary of critical, warning, unknown, unreachable and down
-hosts and services and pops up a detailed status overview when moving
-the mouse pointer over it.
+multiple Nagios, Icinga, Opsview, Centreon, Op5 Monitor/Ninja and
+Check_MK Multisite monitoring servers and resides in systray or as a
+floating statusbar at the desktop showing a brief summary of critical,
+warning, unknown, unreachable and down hosts and services and pops up
+a detailed status overview when moving the mouse pointer over it.
 
 Connecting to displayed hosts and services is easily established by
 context menu via SSH, RDP and VNC. Users can be notified by sound.
-Hosts and Services can be filtered by category and regular
+Hosts and services can be filtered by category and regular
 expressions.
 
 %prep
-%setup -q -n nagstamon_%{version}
+%setup -qc
+# keep source dir versioned
+mv Nagstamon .%{name}; mv .%{name}/* .
 
 # common license
-rm Nagstamon/resources/LICENSE
+%{__rm} Nagstamon/resources/LICENSE
 
 # win icon
-rm Nagstamon/resources/nagstamon.ico
+%{__rm} Nagstamon/resources/nagstamon.ico
 
 # svg used on linux, switch to .png?
 # see Nagstamon/nagstamonGUI.py def CreateOutputVisuals(self): self.BitmapSuffix = ".png"
@@ -55,9 +58,11 @@
 	--root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 ln $RPM_BUILD_ROOT{%{py_sitescriptdir}/Nagstamon/resources,%{_pixmapsdir}}/nagstamon.png
-rm $RPM_BUILD_ROOT%{py_sitescriptdir}/Nagstamon/resources/nagstamon.1
+%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/Nagstamon/resources/nagstamon.desktop
+%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/Nagstamon/resources/nagstamon.1
+mv $RPM_BUILD_ROOT%{_bindir}/nagstamon{.py,}
 
 %py_postclean
 
@@ -74,10 +79,13 @@
 %dir %{py_sitescriptdir}/Nagstamon
 %{py_sitescriptdir}/Nagstamon/*.py[co]
 %dir %{py_sitescriptdir}/Nagstamon/resources
-%{py_sitescriptdir}/Nagstamon/resources/*.glade
+%{py_sitescriptdir}/Nagstamon/resources/*.ui
 %{py_sitescriptdir}/Nagstamon/resources/*.svg
 %{py_sitescriptdir}/Nagstamon/resources/*.png
 %{py_sitescriptdir}/Nagstamon/resources/*.wav
+%{py_sitescriptdir}/Nagstamon/resources/*.icns
+%dir %{py_sitescriptdir}/Nagstamon/Server
+%{py_sitescriptdir}/Nagstamon/Server/*.py[co]
 %if "%{py_ver}" > "2.4"
 %{py_sitescriptdir}/nagstamon-*.egg-info
 %endif
@@ -88,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2012/03/09 08:11:33  glen
+- up to 0.9.8
+
 Revision 1.4  2012/03/09 07:51:05  glen
 - python-lxml dep
 

================================================================
Index: packages/nagios-nagstamon/nagstamon.desktop
diff -u packages/nagios-nagstamon/nagstamon.desktop:1.2 packages/nagios-nagstamon/nagstamon.desktop:1.3
--- packages/nagios-nagstamon/nagstamon.desktop:1.2	Fri Dec 10 02:23:48 2010
+++ packages/nagios-nagstamon/nagstamon.desktop	Fri Mar  9 09:11:33 2012
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=nagstamon
-Comment=Nagios status monitor 
+Name=Nagstamon
+Comment=Nagios status monitor
 Icon=nagstamon
 Exec=nagstamon
 Terminal=false
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nagstamon/nagios-nagstamon.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-nagstamon/nagstamon.desktop?r1=1.2&r2=1.3&f=u