packages: nagios-nagstamon/nagios-nagstamon.spec - add desktop, keep pngs

[glen]

Author: glen                         Date: Fri Dec 10 01:24:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add desktop, keep pngs

---- Files affected:
packages/nagios-nagstamon:
   nagios-nagstamon.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/nagios-nagstamon/nagios-nagstamon.spec
diff -u packages/nagios-nagstamon/nagios-nagstamon.spec:1.1 packages/nagios-nagstamon/nagios-nagstamon.spec:1.2
--- packages/nagios-nagstamon/nagios-nagstamon.spec:1.1	Fri Dec 10 02:14:16 2010
+++ packages/nagios-nagstamon/nagios-nagstamon.spec	Fri Dec 10 02:24:26 2010
@@ -2,11 +2,13 @@
 Summary:	Nagios Status monitor for your Desktop
 Name:		nagios-nagstamon
 Version:	0.9.4
-Release:	0.6
+Release:	0.9
 License:	GPL v2
 Group:		X11/Applications/Networking
 Source0:	http://downloads.sourceforge.net/nagstamon/nagstamon_%{version}.tar.gz
 # Source0-md5:	52cd8bfc28086e29a84eccb607e9ce3c
+Source1:	nagstamon.desktop
+# Source1-md5:	bf06c260f3ace25a415927bc1aac9914
 URL:		http://nagstamon.sourceforge.net/
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
@@ -39,11 +41,10 @@
 
 # svg used on linux, switch to .png?
 # see Nagstamon/nagstamonGUI.py def CreateOutputVisuals(self): self.BitmapSuffix = ".png"
-rm Nagstamon/resources/*.png
+# .png used for buttons, so keep them
+#rm Nagstamon/resources/*.png
 
 %build
-CC="%{__cc}" \
-CFLAGS="%{rpmcflags}" \
 %{__python} setup.py build
 
 %install
@@ -53,6 +54,9 @@
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+cp -a %{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
 
 %py_postclean
@@ -65,11 +69,14 @@
 %doc ChangeLog COPYRIGHT
 %attr(755,root,root) %{_bindir}/nagstamon
 %{_mandir}/man1/nagstamon.1*
+%{_desktopdir}/nagstamon.desktop
+/usr/share/pixmaps/nagstamon.png
 %dir %{py_sitescriptdir}/Nagstamon
 %{py_sitescriptdir}/Nagstamon/*.py[co]
 %dir %{py_sitescriptdir}/Nagstamon/resources
 %{py_sitescriptdir}/Nagstamon/resources/*.glade
 %{py_sitescriptdir}/Nagstamon/resources/*.svg
+%{py_sitescriptdir}/Nagstamon/resources/*.png
 %{py_sitescriptdir}/Nagstamon/resources/*.wav
 %if "%{py_ver}" > "2.4"
 %{py_sitescriptdir}/nagstamon-*.egg-info
@@ -81,5 +88,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/12/10 01:24:26  glen
+- add desktop, keep pngs
+
 Revision 1.1  2010/12/10 01:14:16  glen
 - new, needs to check what real runtime deps are
================================================================

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