rpms/evolution/devel evolution-2.5.4-fix-missing-declarations.patch, 1.1, 1.2 evolution.spec, 1.108, 1.109

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28258

Modified Files:
	evolution-2.5.4-fix-missing-declarations.patch evolution.spec 
Log Message:
* Wed Jan  4 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-2
- added optional build-time requirement on NetworkManager-glib-devel
- update patch 805 to cover a missing declaration in Network Manager support



evolution-2.5.4-fix-missing-declarations.patch:
 calendar/gui/e-meeting-list-view.c           |    1 +
 mail/mail-tools.c                            |    2 +-
 plugins/publish-calendar/publish-format-fb.c |    1 +
 shell/e-shell.h                              |    1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

Index: evolution-2.5.4-fix-missing-declarations.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-fix-missing-declarations.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.5.4-fix-missing-declarations.patch	4 Jan 2006 06:07:52 -0000	1.1
+++ evolution-2.5.4-fix-missing-declarations.patch	4 Jan 2006 19:49:28 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-2.5.4/calendar/gui/e-meeting-list-view.c.include_itip_utils	2006-01-04 00:15:42.000000000 -0500
-+++ evolution-2.5.4/calendar/gui/e-meeting-list-view.c	2006-01-04 00:15:56.000000000 -0500
+--- evolution-2.5.4/calendar/gui/e-meeting-list-view.c.fix-missing-declarations-2-5-4	2006-01-02 06:38:57.000000000 -0500
++++ evolution-2.5.4/calendar/gui/e-meeting-list-view.c	2006-01-04 14:40:40.000000000 -0500
 @@ -45,6 +45,7 @@
  #include <misc/e-cell-renderer-combo.h>
  #include <libebook/e-destination.h>
@@ -8,8 +8,8 @@
  
  struct _EMeetingListViewPrivate {
  	EMeetingStore *store;
---- evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c.include_itip_utils	2006-01-04 00:33:09.000000000 -0500
-+++ evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c	2006-01-04 00:33:24.000000000 -0500
+--- evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c.fix-missing-declarations-2-5-4	2005-12-19 05:08:10.000000000 -0500
++++ evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c	2006-01-04 14:40:40.000000000 -0500
 @@ -27,6 +27,7 @@
  #include <libedataserver/e-source-list.h>
  #include <libecal/e-cal.h>
@@ -18,8 +18,18 @@
  #include <calendar/common/authentication.h>
  #include "publish-format-fb.h"
  
---- evolution-2.5.4/mail/mail-tools.c.include_itip_utils	2006-01-04 00:23:48.000000000 -0500
-+++ evolution-2.5.4/mail/mail-tools.c	2006-01-04 00:25:21.000000000 -0500
+--- evolution-2.5.4/shell/e-shell.h.fix-missing-declarations-2-5-4	2006-01-04 14:44:06.000000000 -0500
++++ evolution-2.5.4/shell/e-shell.h	2006-01-04 14:47:59.000000000 -0500
+@@ -133,6 +133,7 @@
+ 
+ const char *e_shell_construct_result_to_string (EShellConstructResult result);
+ 
++int e_shell_nm_glib_initialise (EShellWindow *window);
+ 
+ #ifdef __cplusplus
+ }
+--- evolution-2.5.4/mail/mail-tools.c.fix-missing-declarations-2-5-4	2006-01-02 06:38:59.000000000 -0500
++++ evolution-2.5.4/mail/mail-tools.c	2006-01-04 14:40:40.000000000 -0500
 @@ -100,7 +100,7 @@
  	return trash;
  }


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- evolution.spec	4 Jan 2006 06:07:52 -0000	1.108
+++ evolution.spec	4 Jan 2006 19:49:28 -0000	1.109
@@ -24,6 +24,7 @@
 # note that nntp is non-functional in evo 1.3.x
 %define nntp_support 1
 %define exchange_support 1
+%define nm_support 1
 
 %define redhat_menus_version 5.0.4
 
@@ -31,7 +32,7 @@
 
 Name: evolution
 Version: 2.5.4
-Release: 1
+Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -164,6 +165,10 @@
 #define krb5dir `pwd`/krb5-fakeprefix
 %endif
 
+%if %{nm_support}
+BuildRequires: NetworkManager-glib-devel
+%endif
+
 %description
 Evolution is the GNOME mailer, calendar, contact manager and
 communications tool.  The tools which make up Evolution will
@@ -494,6 +499,10 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Wed Jan  4 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-2
+- added optional build-time requirement on NetworkManager-glib-devel
+- update patch 805 to cover a missing declaration in Network Manager support
+
 * Tue Jan  3 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-1
 - 2.5.4
 - update patch 107 to track underlying code changes; rename from