rpms/evolution/F-13 evolution-2.30.1.2-alarm-notify-icons.patch, NONE, 1.1 evolution.spec, 1.453, 1.454

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4524

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.30.1.2-alarm-notify-icons.patch 
Log Message:

* Sat May 08 2010 Matthew Barnes <mbarnes at redhat.com> - 2.30.1-5.fc13
- Add patch for RH bug #588004 (missing icon in alarm dialogs).


evolution-2.30.1.2-alarm-notify-icons.patch:
 Makefile.am   |    1 +
 Makefile.in   |    1 +
 notify-main.c |    4 ++++
 3 files changed, 6 insertions(+)

--- NEW FILE evolution-2.30.1.2-alarm-notify-icons.patch ---
diff -up evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.am.alarm-notify-icons evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.am
--- evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.am.alarm-notify-icons	2010-04-22 17:39:58.000000000 -0500
+++ evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.am	2010-05-08 09:48:00.889170350 -0500
@@ -11,6 +11,7 @@ evolution_alarm_notify_CPPFLAGS = 			\
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/calendar			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
+	-DEVOLUTION_ICONDIR=\""$(icondir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\"	\
 	$(GNOME_PLATFORM_CFLAGS)			\
diff -up evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.in.alarm-notify-icons evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.in
--- evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.in.alarm-notify-icons	2010-05-08 09:48:54.431525421 -0500
+++ evolution-2.30.1.2/calendar/gui/alarm-notify/Makefile.in	2010-05-08 09:52:30.640143364 -0500
@@ -427,6 +427,7 @@ evolution_alarm_notify_CPPFLAGS = \
 	-I$(top_srcdir)/widgets				\
 	-I$(top_srcdir)/calendar			\
 	-DEVOLUTION_UIDIR=\""$(uidir)"\"		\
+	-DEVOLUTION_ICONDIR=\""$(icondir)"\"		\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\"	\
 	$(GNOME_PLATFORM_CFLAGS)			\
diff -up evolution-2.30.1.2/calendar/gui/alarm-notify/notify-main.c.alarm-notify-icons evolution-2.30.1.2/calendar/gui/alarm-notify/notify-main.c
--- evolution-2.30.1.2/calendar/gui/alarm-notify/notify-main.c.alarm-notify-icons	2010-04-26 08:13:16.000000000 -0500
+++ evolution-2.30.1.2/calendar/gui/alarm-notify/notify-main.c	2010-05-08 09:48:00.895746969 -0500
@@ -45,6 +45,7 @@
 gint
 main (gint argc, gchar **argv)
 {
+	GtkIconTheme *icon_theme;
 	AlarmNotify *alarm_notify_service;
 	UniqueApp *app;
 
@@ -71,6 +72,9 @@ main (gint argc, gchar **argv)
 	/* Initialize Camel's type system. */
 	camel_object_get_type();
 
+	icon_theme = gtk_icon_theme_get_default ();
+	gtk_icon_theme_append_search_path (icon_theme, EVOLUTION_ICONDIR);
+
 	gtk_main ();
 
 	if (alarm_notify_service != NULL)


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-13/evolution.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -p -r1.453 -r1.454
--- evolution.spec	8 May 2010 03:59:00 -0000	1.453
+++ evolution.spec	8 May 2010 15:59:40 -0000	1.454
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.30.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -68,6 +68,9 @@ Patch13: evolution-2.30.1.2-notjunk-icon
 # RH bug #589555
 Patch14: evolution-2.30.1-help-contents.patch
 
+# RH bug #588004 / GNOME bug #618113
+Patch15: evolution-2.30.1.2-alarm-notify-icons.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -235,6 +238,7 @@ This package contains the plugin to impo
 %patch12 -p1 -b .im-context-reset
 %patch13 -p1 -b .notjunk-icon
 %patch14 -p1 -b .help-contents
+%patch15 -p1 -b .alarm-notify-icons
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -686,6 +690,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat May 08 2010 Matthew Barnes <mbarnes at redhat.com> - 2.30.1-5.fc13
+- Add patch for RH bug #588004 (missing icon in alarm dialogs).
+
 * Fri May 07 2010 Matthew Barnes <mbarnes at redhat.com> - 2.30.1-4.fc13
 - Require yelp in evolution-help (RH bug #589555).
 - Add patch for RH bug #589555 (hide Help->Contents if evolution-help