rpms/evolution-data-server/devel .cvsignore, 1.55, 1.56 evolution-data-server-1.8.0-kill-emutex.patch, 1.1, 1.2 evolution-data-server.spec, 1.139, 1.140 sources, 1.55, 1.56 evolution-data-server-1.9.1-fix-categories.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Dec 4 21:07:53 UTC 2006


Author: mbarnes

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

Modified Files:
	.cvsignore evolution-data-server-1.8.0-kill-emutex.patch 
	evolution-data-server.spec sources 
Removed Files:
	evolution-data-server-1.9.1-fix-categories.patch 
Log Message:

* Mon Dec 04 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.3-1.fc7
- Update to 1.9.3
- Remove patch for GNOME bug #353924 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore	7 Nov 2006 03:44:09 -0000	1.55
+++ .cvsignore	4 Dec 2006 21:07:51 -0000	1.56
@@ -1 +1 @@
-evolution-data-server-1.9.2.tar.bz2
+evolution-data-server-1.9.3.tar.bz2

evolution-data-server-1.8.0-kill-emutex.patch:
 camel-folder.c                                |   30 +++---
 camel-object.c                                |   26 ++---
 camel-private.h                               |   37 +++++--
 camel-provider.c                              |    7 -
 camel-service.c                               |   22 ++--
 camel-store.c                                 |   10 +-
 camel-text-index.c                            |   12 +-
 providers/groupwise/camel-groupwise-folder.c  |  127 ++++++++++++--------------
 providers/groupwise/camel-groupwise-private.h |   21 ++--
 providers/groupwise/camel-groupwise-store.c   |   77 +++++++--------
 providers/imap/camel-imap-command.c           |   18 +--
 providers/imap/camel-imap-folder.c            |  124 ++++++++++++-------------
 providers/imap/camel-imap-private.h           |   24 ++--
 providers/imap/camel-imap-store.c             |   73 ++++++--------
 providers/nntp/camel-nntp-folder.c            |   26 ++---
 providers/nntp/camel-nntp-store.c             |   37 +++----
 16 files changed, 338 insertions(+), 333 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 evolution-data-server-1.8.0-kill-emutex.patch
Index: evolution-data-server-1.8.0-kill-emutex.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.8.0-kill-emutex.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.8.0-kill-emutex.patch	27 Oct 2006 20:31:18 -0000	1.1
+++ evolution-data-server-1.8.0-kill-emutex.patch	4 Dec 2006 21:07:51 -0000	1.2
@@ -1,5 +1,197 @@
---- evolution-data-server-1.8.0/camel/camel-object.c.emutex	2006-09-02 02:36:54.000000000 -0400
-+++ evolution-data-server-1.8.0/camel/camel-object.c	2006-09-14 10:48:11.000000000 -0400
+--- evolution-data-server-1.9.3/camel/camel-private.h.kill-emutex	2005-12-08 03:59:32.000000000 -0500
++++ evolution-data-server-1.9.3/camel/camel-private.h	2006-12-04 15:26:07.000000000 -0500
+@@ -39,23 +39,31 @@
+ #include <libedataserver/e-msgport.h>
+ 
+ struct _CamelFolderPrivate {
+-	EMutex *lock;
+-	EMutex *change_lock;
++	GStaticRecMutex lock;
++	GStaticMutex change_lock;
+ 	/* must require the 'change_lock' to access this */
+ 	int frozen;
+ 	struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */
+ };
+ 
+-#define CAMEL_FOLDER_LOCK(f, l) (e_mutex_lock(((CamelFolder *)f)->priv->l))
+-#define CAMEL_FOLDER_UNLOCK(f, l) (e_mutex_unlock(((CamelFolder *)f)->priv->l))
++#define CAMEL_FOLDER_LOCK(f, l) \
++	(g_static_mutex_lock(&((CamelFolder *)f)->priv->l))
++#define CAMEL_FOLDER_UNLOCK(f, l) \
++	(g_static_mutex_unlock(&((CamelFolder *)f)->priv->l))
++#define CAMEL_FOLDER_REC_LOCK(f, l) \
++	(g_static_rec_mutex_lock(&((CamelFolder *)f)->priv->l))
++#define CAMEL_FOLDER_REC_UNLOCK(f, l) \
++	(g_static_rec_mutex_unlock(&((CamelFolder *)f)->priv->l))
+ 
+ 
+ struct _CamelStorePrivate {
+-	EMutex *folder_lock;	/* for locking folder operations */
++	GStaticRecMutex folder_lock;	/* for locking folder operations */
+ };
+ 
+-#define CAMEL_STORE_LOCK(f, l) (e_mutex_lock(((CamelStore *)f)->priv->l))
+-#define CAMEL_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelStore *)f)->priv->l))
++#define CAMEL_STORE_LOCK(f, l) \
++	(g_static_rec_mutex_lock(&((CamelStore *)f)->priv->l))
++#define CAMEL_STORE_UNLOCK(f, l) \
++	(g_static_rec_mutex_unlock(&((CamelStore *)f)->priv->l))
+ 
+ 
+ struct _CamelTransportPrivate {
+@@ -67,13 +75,18 @@
+ 
+ 
+ struct _CamelServicePrivate {
+-	EMutex *connect_lock;	/* for locking connection operations */
+-	EMutex *connect_op_lock;/* for locking the connection_op */
++	GStaticRecMutex connect_lock;	/* for locking connection operations */
++	GStaticMutex connect_op_lock;	/* for locking the connection_op */
+ };
+ 
+-#define CAMEL_SERVICE_LOCK(f, l) (e_mutex_lock(((CamelService *)f)->priv->l))
+-#define CAMEL_SERVICE_UNLOCK(f, l) (e_mutex_unlock(((CamelService *)f)->priv->l))
+-#define CAMEL_SERVICE_ASSERT_LOCKED(f, l) (e_mutex_assert_locked (((CamelService *)f)->priv->l))
++#define CAMEL_SERVICE_LOCK(f, l) \
++	(g_static_mutex_lock(&((CamelService *)f)->priv->l))
++#define CAMEL_SERVICE_UNLOCK(f, l) \
++	(g_static_mutex_unlock(&((CamelService *)f)->priv->l))
++#define CAMEL_SERVICE_REC_LOCK(f, l) \
++	(g_static_rec_mutex_lock(&((CamelService *)f)->priv->l))
++#define CAMEL_SERVICE_REC_UNLOCK(f, l) \
++	(g_static_rec_mutex_unlock(&((CamelService *)f)->priv->l))
+ 
+ 
+ struct _CamelSessionPrivate {
+--- evolution-data-server-1.9.3/camel/camel-provider.c.kill-emutex	2005-11-30 04:54:54.000000000 -0500
++++ evolution-data-server-1.9.3/camel/camel-provider.c	2006-12-04 15:26:07.000000000 -0500
+@@ -51,10 +51,10 @@
+ static GHashTable *module_table;
+ /* table of CamelProvider's */
+ static GHashTable *provider_table;
+-static EMutex *provider_lock;
++static GStaticRecMutex provider_lock = G_STATIC_REC_MUTEX_INIT;
+ 
+-#define LOCK() e_mutex_lock(provider_lock);
+-#define UNLOCK() e_mutex_unlock(provider_lock);
++#define LOCK()		(g_static_rec_mutex_lock(&provider_lock))
++#define UNLOCK()	(g_static_rec_mutex_unlock(&provider_lock))
+ 
+ /* The vfolder provider is always available */
+ static CamelProvider vee_provider = {
+@@ -76,7 +76,6 @@
+ static void
+ provider_setup(void)
+ {
+-	provider_lock = e_mutex_new(E_MUTEX_REC);
+ 	module_table = g_hash_table_new(camel_strcase_hash, camel_strcase_equal);
+ 	provider_table = g_hash_table_new(camel_strcase_hash, camel_strcase_equal);
+ 
+--- evolution-data-server-1.9.3/camel/camel-folder.c.kill-emutex	2006-06-15 11:22:10.000000000 -0400
++++ evolution-data-server-1.9.3/camel/camel-folder.c	2006-12-04 15:26:07.000000000 -0500
+@@ -171,8 +171,8 @@
+ 	folder->priv = g_malloc0(sizeof(*folder->priv));
+ 	folder->priv->frozen = 0;
+ 	folder->priv->changed_frozen = camel_folder_change_info_new();
+-	folder->priv->lock = e_mutex_new(E_MUTEX_REC);
+-	folder->priv->change_lock = e_mutex_new(E_MUTEX_SIMPLE);
++	g_static_rec_mutex_init(&folder->priv->lock);
++	g_static_mutex_init(&folder->priv->change_lock);
+ }
+ 
+ static void
+@@ -193,8 +193,8 @@
+ 
+ 	camel_folder_change_info_free(p->changed_frozen);
+ 	
+-	e_mutex_destroy(p->lock);
+-	e_mutex_destroy(p->change_lock);
++	g_static_rec_mutex_free(&p->lock);
++	g_static_mutex_free(&p->change_lock);
+ 	
+ 	g_free(p);
+ }
+@@ -267,12 +267,12 @@
+ {
+ 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
+ 
+-	CAMEL_FOLDER_LOCK(folder, lock);
++	CAMEL_FOLDER_REC_LOCK(folder, lock);
+ 	
+ 	if (!(folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED))
+ 		CF_CLASS (folder)->sync (folder, expunge, ex);
+ 	
+-	CAMEL_FOLDER_UNLOCK(folder, lock);
++	CAMEL_FOLDER_REC_UNLOCK(folder, lock);
+ }
+ 
+ 
+@@ -529,12 +529,12 @@
+ {
+ 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
+ 	
+-	CAMEL_FOLDER_LOCK(folder, lock);
++	CAMEL_FOLDER_REC_LOCK(folder, lock);
+ 	
+ 	if (!(folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED))
+ 		CF_CLASS (folder)->expunge (folder, ex);
+ 	
+-	CAMEL_FOLDER_UNLOCK(folder, lock);
++	CAMEL_FOLDER_REC_UNLOCK(folder, lock);
+ }
+ 
+ static int
+@@ -643,11 +643,11 @@
+ {
+ 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
+ 
+-	CAMEL_FOLDER_LOCK(folder, lock);
++	CAMEL_FOLDER_REC_LOCK(folder, lock);
+ 
+ 	CF_CLASS (folder)->append_message (folder, message, info, appended_uid, ex);
+ 
+-	CAMEL_FOLDER_UNLOCK(folder, lock);
++	CAMEL_FOLDER_REC_UNLOCK(folder, lock);
+ }
+ 
+ 
+@@ -1065,11 +1065,11 @@
+ 
+ 	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);
+ 
+-	CAMEL_FOLDER_LOCK(folder, lock);
++	CAMEL_FOLDER_REC_LOCK(folder, lock);
+ 
+ 	ret = CF_CLASS (folder)->get_message (folder, uid, ex);
+ 
+-	CAMEL_FOLDER_UNLOCK(folder, lock);
++	CAMEL_FOLDER_REC_UNLOCK(folder, lock);
+ 
+ 	if (ret && camel_debug_start(":folder")) {
+ 		printf("CamelFolder:get_message('%s', '%s') =\n", folder->full_name, uid);
+@@ -1474,9 +1474,9 @@
+ {
+ 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
+ 	
+-	CAMEL_FOLDER_LOCK (folder, lock);
++	CAMEL_FOLDER_REC_LOCK (folder, lock);
+ 	if (folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED) {
+-		CAMEL_FOLDER_UNLOCK (folder, lock);
++		CAMEL_FOLDER_REC_UNLOCK (folder, lock);
+ 		return;
+ 	}
+ 	
+@@ -1484,7 +1484,7 @@
+ 	
+ 	CF_CLASS (folder)->delete (folder);
+ 
+-	CAMEL_FOLDER_UNLOCK (folder, lock);
++	CAMEL_FOLDER_REC_UNLOCK (folder, lock);
[...2370 lines suppressed...]
+ 	
+-	e_mutex_destroy (service->priv->connect_lock);
+-	e_mutex_destroy (service->priv->connect_op_lock);
++	g_static_rec_mutex_free (&service->priv->connect_lock);
++	g_static_mutex_free (&service->priv->connect_op_lock);
+ 	
+ 	g_free (service->priv);
+ }
+@@ -346,10 +346,10 @@
+ 	g_return_val_if_fail (service->session != NULL, FALSE);
+ 	g_return_val_if_fail (service->url != NULL, FALSE);
+ 	
+-	CAMEL_SERVICE_LOCK (service, connect_lock);
++	CAMEL_SERVICE_REC_LOCK (service, connect_lock);
+ 	
+ 	if (service->status == CAMEL_SERVICE_CONNECTED) {
+-		CAMEL_SERVICE_UNLOCK (service, connect_lock);
++		CAMEL_SERVICE_REC_UNLOCK (service, connect_lock);
+ 		return TRUE;
+ 	}
  
- 	ret = CF_CLASS (folder)->get_message (folder, uid, ex);
+@@ -379,7 +379,7 @@
+ 	}
+ 	CAMEL_SERVICE_UNLOCK (service, connect_op_lock);
  
--	CAMEL_FOLDER_UNLOCK(folder, lock);
-+	CAMEL_FOLDER_REC_UNLOCK(folder, lock);
+-	CAMEL_SERVICE_UNLOCK (service, connect_lock);
++	CAMEL_SERVICE_REC_UNLOCK (service, connect_lock);
+ 	
+ 	return ret;
+ }
+@@ -415,7 +415,7 @@
+ 	gboolean res = TRUE;
+ 	int unreg = FALSE;
  
- 	if (ret && camel_debug_start(":folder")) {
- 		printf("CamelFolder:get_message('%s', '%s') =\n", folder->full_name, uid);
-@@ -1474,9 +1474,9 @@
- {
- 	g_return_if_fail (CAMEL_IS_FOLDER (folder));
+-	CAMEL_SERVICE_LOCK (service, connect_lock);
++	CAMEL_SERVICE_REC_LOCK (service, connect_lock);
  	
--	CAMEL_FOLDER_LOCK (folder, lock);
-+	CAMEL_FOLDER_REC_LOCK (folder, lock);
- 	if (folder->folder_flags & CAMEL_FOLDER_HAS_BEEN_DELETED) {
--		CAMEL_FOLDER_UNLOCK (folder, lock);
-+		CAMEL_FOLDER_REC_UNLOCK (folder, lock);
- 		return;
+ 	if (service->status != CAMEL_SERVICE_DISCONNECTED
+ 	    && service->status != CAMEL_SERVICE_DISCONNECTING) {
+@@ -441,7 +441,7 @@
+ 		CAMEL_SERVICE_UNLOCK (service, connect_op_lock);
  	}
  	
-@@ -1484,7 +1484,7 @@
+-	CAMEL_SERVICE_UNLOCK (service, connect_lock);
++	CAMEL_SERVICE_REC_UNLOCK (service, connect_lock);
  	
- 	CF_CLASS (folder)->delete (folder);
- 
--	CAMEL_FOLDER_UNLOCK (folder, lock);
-+	CAMEL_FOLDER_REC_UNLOCK (folder, lock);
- 
- 	camel_object_trigger_event (folder, "deleted", NULL);
+ 		service->status = CAMEL_SERVICE_DISCONNECTED;
+ 	return res;
+@@ -638,9 +638,9 @@
+ 	
+ 	/* note that we get the connect lock here, which means the callee
+ 	   must not call the connect functions itself */
+-	CAMEL_SERVICE_LOCK (service, connect_lock);
++	CAMEL_SERVICE_REC_LOCK (service, connect_lock);
+ 	ret = CSERV_CLASS (service)->query_auth_types (service, ex);
+-	CAMEL_SERVICE_UNLOCK (service, connect_lock);
++	CAMEL_SERVICE_REC_UNLOCK (service, connect_lock);
+ 	
+ 	return ret;
  }
---- evolution-data-server-1.8.0/camel/camel-text-index.c.emutex	2006-04-20 04:52:54.000000000 -0400
-+++ evolution-data-server-1.8.0/camel/camel-text-index.c	2006-09-14 10:48:12.000000000 -0400
+--- evolution-data-server-1.9.3/camel/camel-text-index.c.kill-emutex	2006-04-12 15:14:13.000000000 -0400
++++ evolution-data-server-1.9.3/camel/camel-text-index.c	2006-12-04 15:26:07.000000000 -0500
 @@ -55,8 +55,10 @@
  
  #define CAMEL_TEXT_INDEX_MAX_WORDLEN  (36)
@@ -2269,68 +2327,50 @@
  	
  	g_free(p);
  }
---- evolution-data-server-1.8.0/camel/camel-private.h.emutex	2005-12-08 03:59:32.000000000 -0500
-+++ evolution-data-server-1.8.0/camel/camel-private.h	2006-09-14 10:48:11.000000000 -0400
-@@ -39,23 +39,31 @@
- #include <libedataserver/e-msgport.h>
- 
- struct _CamelFolderPrivate {
--	EMutex *lock;
--	EMutex *change_lock;
-+	GStaticRecMutex lock;
-+	GStaticMutex change_lock;
- 	/* must require the 'change_lock' to access this */
- 	int frozen;
- 	struct _CamelFolderChangeInfo *changed_frozen; /* queues changed events */
- };
- 
--#define CAMEL_FOLDER_LOCK(f, l) (e_mutex_lock(((CamelFolder *)f)->priv->l))
--#define CAMEL_FOLDER_UNLOCK(f, l) (e_mutex_unlock(((CamelFolder *)f)->priv->l))
-+#define CAMEL_FOLDER_LOCK(f, l) \
-+	(g_static_mutex_lock(&((CamelFolder *)f)->priv->l))
-+#define CAMEL_FOLDER_UNLOCK(f, l) \
-+	(g_static_mutex_unlock(&((CamelFolder *)f)->priv->l))
-+#define CAMEL_FOLDER_REC_LOCK(f, l) \
-+	(g_static_rec_mutex_lock(&((CamelFolder *)f)->priv->l))
-+#define CAMEL_FOLDER_REC_UNLOCK(f, l) \
-+	(g_static_rec_mutex_unlock(&((CamelFolder *)f)->priv->l))
- 
- 
- struct _CamelStorePrivate {
--	EMutex *folder_lock;	/* for locking folder operations */
-+	GStaticRecMutex folder_lock;	/* for locking folder operations */
- };
- 
--#define CAMEL_STORE_LOCK(f, l) (e_mutex_lock(((CamelStore *)f)->priv->l))
--#define CAMEL_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelStore *)f)->priv->l))
-+#define CAMEL_STORE_LOCK(f, l) \
-+	(g_static_rec_mutex_lock(&((CamelStore *)f)->priv->l))
-+#define CAMEL_STORE_UNLOCK(f, l) \
-+	(g_static_rec_mutex_unlock(&((CamelStore *)f)->priv->l))
- 
- 
- struct _CamelTransportPrivate {
-@@ -67,13 +75,18 @@
- 
+--- evolution-data-server-1.9.3/camel/camel-store.c.kill-emutex	2006-04-12 15:14:13.000000000 -0400
++++ evolution-data-server-1.9.3/camel/camel-store.c	2006-12-04 15:26:07.000000000 -0500
+@@ -140,7 +140,7 @@
+ 	store->mode = CAMEL_STORE_READ|CAMEL_STORE_WRITE;
  
- struct _CamelServicePrivate {
--	EMutex *connect_lock;	/* for locking connection operations */
--	EMutex *connect_op_lock;/* for locking the connection_op */
-+	GStaticRecMutex connect_lock;	/* for locking connection operations */
-+	GStaticMutex connect_op_lock;	/* for locking the connection_op */
- };
+ 	store->priv = g_malloc0 (sizeof (*store->priv));
+-	store->priv->folder_lock = e_mutex_new (E_MUTEX_REC);
++	g_static_rec_mutex_init (&store->priv->folder_lock);
+ }
  
--#define CAMEL_SERVICE_LOCK(f, l) (e_mutex_lock(((CamelService *)f)->priv->l))
--#define CAMEL_SERVICE_UNLOCK(f, l) (e_mutex_unlock(((CamelService *)f)->priv->l))
--#define CAMEL_SERVICE_ASSERT_LOCKED(f, l) (e_mutex_assert_locked (((CamelService *)f)->priv->l))
-+#define CAMEL_SERVICE_LOCK(f, l) \
-+	(g_static_mutex_lock(&((CamelService *)f)->priv->l))
-+#define CAMEL_SERVICE_UNLOCK(f, l) \
-+	(g_static_mutex_unlock(&((CamelService *)f)->priv->l))
-+#define CAMEL_SERVICE_REC_LOCK(f, l) \
-+	(g_static_rec_mutex_lock(&((CamelService *)f)->priv->l))
-+#define CAMEL_SERVICE_REC_UNLOCK(f, l) \
-+	(g_static_rec_mutex_unlock(&((CamelService *)f)->priv->l))
+ static void
+@@ -151,7 +151,7 @@
+ 	if (store->folders)
+ 		camel_object_bag_destroy(store->folders);
+ 	
+-	e_mutex_destroy (store->priv->folder_lock);
++	g_static_rec_mutex_free (&store->priv->folder_lock);
+ 	
+ 	g_free (store->priv);
+ }
+@@ -472,7 +472,7 @@
+ 				&& strncmp(folder->full_name, old_name, oldlen) == 0
+ 				&& folder->full_name[oldlen] == '/')) {
+ 				d(printf("Found subfolder of '%s' == '%s'\n", old_name, folder->full_name));
+-				CAMEL_FOLDER_LOCK(folder, lock);
++				CAMEL_FOLDER_REC_LOCK(folder, lock);
+ 			} else {
+ 				g_ptr_array_remove_index_fast(folders, i);
+ 				i--;
+@@ -499,7 +499,7 @@
+ 			camel_folder_rename(folder, new);
+ 			g_free(new);
  
+-			CAMEL_FOLDER_UNLOCK(folder, lock);
++			CAMEL_FOLDER_REC_UNLOCK(folder, lock);
+ 			camel_object_unref(folder);
+ 		}
  
- struct _CamelSessionPrivate {
+@@ -517,7 +517,7 @@
+ 		/* Failed, just unlock our folders for re-use */
+ 		for (i=0;i<folders->len;i++) {
+ 			folder = folders->pdata[i];
+-			CAMEL_FOLDER_UNLOCK(folder, lock);
++			CAMEL_FOLDER_REC_UNLOCK(folder, lock);
+ 			camel_object_unref(folder);
+ 		}
+ 	}


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- evolution-data-server.spec	10 Nov 2006 04:09:57 -0000	1.139
+++ evolution-data-server.spec	4 Dec 2006 21:07:51 -0000	1.140
@@ -24,8 +24,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.9.2
-Release: 3%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -50,29 +50,26 @@
 # RH bug #203915
 Patch17: evolution-data-server-1.8.0-fix-camel-malloc.patch
 
-# Gnome.org bug #356177
+# GNOME bug #356177
 Patch18: evolution-data-server-1.8.0-kill-emutex.patch
 
-# Gnome.org bug #360240
+# GNOME bug #360240
 Patch19: evolution-data-server-1.8.1-warn-unused-variable.patch
 
-# Gnome.org bug #360619
+# GNOME bug #360619
 Patch20: evolution-data-server-1.8.1-warn-incompatible-pointer-type.patch
 
-# Gnome.org bug #362638
+# GNOME bug #362638
 Patch21: evolution-data-server-1.8.1-kill-ethread.patch
 
-# Gnome.org bug #363965
+# GNOME bug #363965
 Patch22: evolution-data-server-1.9.1-kill-ememory.patch
 
-# Gnome.org bug #353924
-Patch23: evolution-data-server-1.9.1-fix-categories.patch
-
 # RH bug #203058
-Patch24: evolution-data-server-1.9.2-fix-name-selector-dialog.patch
+Patch23: evolution-data-server-1.9.2-fix-name-selector-dialog.patch
 
 # RH bug #210142
-Patch25: evolution-data-server-1.9.2-strftime.patch
+Patch24: evolution-data-server-1.9.2-strftime.patch
 
 ### Dependencies ###
 
@@ -163,9 +160,8 @@
 %patch20 -p1 -b .warn-incompatible-pointer-type
 %patch21 -p1 -b .kill-ethread
 %patch22 -p1 -b .kill-ememory
-%patch23 -p1 -b .fix-categories
-%patch24 -p1 -b .fix-name-selector-dialog
-%patch25 -p1 -b .strftime
+%patch23 -p1 -b .fix-name-selector-dialog
+%patch24 -p1 -b .strftime
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -383,6 +379,10 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Dec 04 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.3-1.fc7
+- Update to 1.9.3
+- Remove patch for GNOME bug #353924 (fixed upstream).
+
 * Fri Nov 10 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.2-3.fc7
 - Add patch for RH bug #210142 (calendar crash in indic locales).
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	7 Nov 2006 03:44:09 -0000	1.55
+++ sources	4 Dec 2006 21:07:51 -0000	1.56
@@ -1 +1 @@
-5d526c50a2cc507fd37b4a74b49cb870  evolution-data-server-1.9.2.tar.bz2
+11298d62ba1324b213428c81a0a84b5e  evolution-data-server-1.9.3.tar.bz2


--- evolution-data-server-1.9.1-fix-categories.patch DELETED ---




More information about the fedora-cvs-commits mailing list