[nagios] * Patch nagios-0010-Added-several-images-to-the-sample-config.patch refactored (#875362)

[Jose Pedro Oliveira]

commit edad0f7282f64ea6cb4e2a6e165140c1df3ebf7e
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Sun Jan 13 05:04:42 2013 +0000

     * Patch nagios-0010-Added-several-images-to-the-sample-config.patch refactored (#875362)

 ...-several-images-to-the-sample-config-revb.patch |   26 ++++++++++++++++++++
 nagios.spec                                        |   17 +++++++++++-
 printer.png                                        |  Bin 0 -> 1649 bytes
 router.png                                         |  Bin 0 -> 2079 bytes
 switch.png                                         |  Bin 0 -> 1181 bytes
 5 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/nagios-0010-Added-several-images-to-the-sample-config-revb.patch b/nagios-0010-Added-several-images-to-the-sample-config-revb.patch
new file mode 100644
index 0000000..e141284
--- /dev/null
+++ b/nagios-0010-Added-several-images-to-the-sample-config-revb.patch
@@ -0,0 +1,26 @@
+--- nagios-3.4.4/sample-config/template-object/templates.cfg.in	2007-10-03 22:43:14.000000000 +0100
++++ nagios-3.4.4-modified/sample-config/template-object/templates.cfg.in	2013-01-13 03:12:00.791398046 +0000
+@@ -117,6 +117,7 @@
+ 	notification_interval	30		; Resend notifications every 30 minutes
+ 	notification_options	d,r		; Only send notifications for specific host states
+ 	contact_groups		admins		; Notifications get sent to the admins by default
++	statusmap_image		printer.png
+ 	register		0		; DONT REGISTER THIS - ITS JUST A TEMPLATE
+ 	}
+ 
+@@ -134,6 +135,15 @@
+ 	notification_interval	30		; Resend notifications every 30 minutes
+ 	notification_options	d,r		; Only send notifications for specific host states
+ 	contact_groups		admins		; Notifications get sent to the admins by default
++	statusmap_image		switch.png
++	register		0		; DONT REGISTER THIS - ITS JUST A TEMPLATE
++	}
++
++# Define a template for routers that we can reuse
++define host{
++	name			generic-router	; The name of this host template
++	use			generic-switch	; Inherit default values from the generic-host template
++	statusmap_image		router.png
+ 	register		0		; DONT REGISTER THIS - ITS JUST A TEMPLATE
+ 	}
+ 
diff --git a/nagios.spec b/nagios.spec
index 5426ce0..beb2e4b 100644
--- a/nagios.spec
+++ b/nagios.spec
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 3.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -13,6 +13,11 @@ Source3: nagios.internet.cfg
 Source4: nagios.htpasswd
 Source5: nagios.upgrade_to_v3.ReadMe
 Source6: nagios.upgrade_to_v3.sh
+# PNG files from the old nagios-0010-Added-several-images-to-the-sample-config.patch
+Source10: printer.png
+Source11: router.png
+Source12: switch.png
+
 Patch1: nagios-0001-from-rpm.patch
 Patch2: nagios-0002-SELinux-relabeling.patch
 # Sent upstream
@@ -25,7 +30,7 @@ Patch6: nagios-0006-Do-not-start-service-by-default.patch
 Patch7: nagios-0007-The-init-script-should-return-2-in-case-of-unknown-c.patch
 Patch8: nagios-0008-Fix-path-to-CGI-executables.patch
 Patch9: nagios-0009-Fixed-path-to-passwd-file-in-Apache-s-config-file.patch
-Patch10: nagios-0010-Added-several-images-to-the-sample-config.patch
+Patch10: nagios-0010-Added-several-images-to-the-sample-config-revb.patch
 Patch11: nagios-0011-Fixed-strange-permissions.patch
 Patch12: nagios-3.4.3-httpd-2.4-and-2.2.patch
 
@@ -134,6 +139,8 @@ may compile against.
 %patch11 -p1 -b .fix_perms
 %patch12 -p1 -b .httpd_conf
 
+install -p -m 0644 %{SOURCE10} %{SOURCE11} %{SOURCE12} html/images/logos/
+
 
 %build
 %configure \
@@ -269,6 +276,12 @@ fi
 
 
 %changelog
+* Sun Jan 13 2013 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.4.3-5
+- Refactored the patch nagios-0010-Added-several-images-to-the-sample-config.patch
+  as patch can't create binary files (#875362).
+  The old patch10 was replaced by nagios-0010-Added-several-images-to-the-sample-config-revb.patch
+  and the PNG files included as sources 10, 11, and 12.
+
 * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 3.4.3-4
 - rebuild against new libjpeg
 
diff --git a/printer.png b/printer.png
new file mode 100644
index 0000000..e00c62f
Binary files /dev/null and b/printer.png differ
diff --git a/router.png b/router.png
new file mode 100644
index 0000000..c392744
Binary files /dev/null and b/router.png differ
diff --git a/switch.png b/switch.png
new file mode 100644
index 0000000..753bae9
Binary files /dev/null and b/switch.png differ