rpms/evolution-connector/devel evolution-exchange-2.11.2-deprecated-eds.patch, NONE, 1.1 evolution-connector.spec, 1.101, 1.102

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-connector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16430

Modified Files:
	evolution-connector.spec 
Added Files:
	evolution-exchange-2.11.2-deprecated-eds.patch 
Log Message:

* Fri May 18 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.2-1.fc8
- Update to 2.11.2
- Bump evo_version to 2.11.0, eds_version to 1.11.0, and evo_major to 2.12.
- Remove evolution-exchange-2.5.3-fix-marshaller.patch (obsolete).
- Remove patch for GNOME bug #405916 (fixed upstream).


evolution-exchange-2.11.2-deprecated-eds.patch:

--- NEW FILE evolution-exchange-2.11.2-deprecated-eds.patch ---
--- evolution-exchange-2.11.2/storage/main.c.deprecated-eds	2007-04-18 06:19:14.000000000 -0400
+++ evolution-exchange-2.11.2/storage/main.c	2007-05-18 22:46:01.000000000 -0400
@@ -37,7 +37,6 @@
 
 #include <camel/camel.h>
 #include <e-util/e-icon-factory.h>
-#include <libedataserverui/e-passwords.h>
 #include <libedata-book/e-data-book-factory.h>
 #include <libedata-cal/e-data-cal-factory.h>
 #include <libedataserver/e-data-server-module.h>
@@ -237,7 +236,6 @@
 
 	bonobo_main ();
 
-	e_passwords_shutdown ();
 	return 0;
 
  failed:
--- evolution-exchange-2.11.2/storage/exchange-migrate.c.deprecated-eds	2007-04-18 06:19:14.000000000 -0400
+++ evolution-exchange-2.11.2/storage/exchange-migrate.c	2007-05-18 22:45:22.000000000 -0400
@@ -242,7 +242,7 @@
 	struct stat st;
 	DIR *dir;
 
-	if (e_util_mkdir_hier (dest, 0777) == -1)
+	if (g_mkdir_with_parents (dest, 0777) == -1)
 		return FALSE;
 
 	if (!(dir = opendir (src)))
@@ -374,7 +374,7 @@
 							NULL);
 			
 				/* Create destination dir, and copy the files */
-       				if (e_util_mkdir_hier (contacts_dir, 0777) == -1) {
+       				if (g_mkdir_with_parents (contacts_dir, 0777) == -1) {
 					ret = FALSE;
 					g_free (dest_file);
 					g_free (contacts_dir);
@@ -471,7 +471,7 @@
 		/* This is not needed if done by cp_r() */
         	if (stat (base_dir, &st) == -1) {
 			if (errno != ENOENT || 
-			    e_util_mkdir_hier (base_dir, 0777) == -1) {
+			    g_mkdir_with_parents (base_dir, 0777) == -1) {
                        		printf ("Failed to create directory `%s': %s",
 				base_dir, g_strerror (errno));
                         	return;
--- evolution-exchange-2.11.2/storage/ximian-connector-setup.c.deprecated-eds	2007-05-18 22:45:33.000000000 -0400
+++ evolution-exchange-2.11.2/storage/ximian-connector-setup.c	2007-05-18 22:45:42.000000000 -0400
@@ -25,7 +25,6 @@
 #include <libgnomeui/gnome-ui-init.h>
 
 #include <e-util/e-dialog-utils.h>
-#include <libedataserverui/e-passwords.h>
 
 #include <e2k-utils.h>
 
@@ -45,6 +44,5 @@
 			    NULL);
 
 	exchange_autoconfig_druid_run ();
-	e_passwords_shutdown ();
 	return 0;
 }
--- evolution-exchange-2.11.2/camel/camel-exchange-folder.c.deprecated-eds	2007-05-09 00:14:56.000000000 -0400
+++ evolution-exchange-2.11.2/camel/camel-exchange-folder.c	2007-05-18 22:45:22.000000000 -0400
@@ -1011,7 +1011,7 @@
 		short_name = name;
 	camel_folder_construct (folder, parent, name, short_name);
 
-	if (e_util_mkdir_hier (folder_dir, S_IRWXU) != 0) {
+	if (g_mkdir_with_parents (folder_dir, S_IRWXU) != 0) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Could not create directory %s: %s"),
 				      folder_dir, g_strerror (errno));


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- evolution-connector.spec	19 May 2007 01:29:51 -0000	1.101
+++ evolution-connector.spec	19 May 2007 03:09:08 -0000	1.102
@@ -41,6 +41,9 @@
 # We do not ship gnome-common (or at least we're not supposed to).
 Patch13: evolution-exchange-2.7.2-no_gnome_common.patch
 
+# GNOME bug #439579
+Patch14: evolution-exchange-2.11.2-deprecated-eds.patch
+
 ### Dependencies ###
 
 Requires: db4
@@ -78,6 +81,7 @@
 %patch11 -p1 -b .fix-64bit-acinclude.m4
 #%patch12 -p1 -b .fix-marshaller
 %patch13 -p1 -b .no_gnome_common
+%patch14 -p1 -b .deprecated-eds
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -105,6 +109,7 @@
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DGTK_DISABLE_DEPRECATED=1 \
 	-DGNOME_DISABLE_DEPRECATED=1 \
+	-DEDS_DISABLE_DEPRECATED=1 \
 	-Wdeclaration-after-statement \
 	-Werror-implicit-function-declaration"
 %endif