rpms/evolution-exchange/devel evolution-exchange-2.11.90-glibc-open.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 evolution-exchange.spec, 1.5, 1.6 sources, 1.5, 1.6

[Matthew Barnes (mbarnes)]

Author: mbarnes

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

Modified Files:
	.cvsignore evolution-exchange.spec sources 
Added Files:
	evolution-exchange-2.11.90-glibc-open.patch 
Log Message:

* Wed Aug 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.90-1.fc8
- Update to 2.11.90
- Add patch for GNOME bug #466987 (glibc redefines "open").


evolution-exchange-2.11.90-glibc-open.patch:

--- NEW FILE evolution-exchange-2.11.90-glibc-open.patch ---
--- evolution-exchange-2.11.90/addressbook/e-book-backend-gal.c.glibc-open	2007-08-15 16:07:47.000000000 -0400
+++ evolution-exchange-2.11.90/addressbook/e-book-backend-gal.c	2007-08-15 16:08:14.000000000 -0400
@@ -2470,7 +2470,7 @@ load_source (EBookBackend *backend,
  				return GNOME_Evolution_Addressbook_OtherError;
  			}
  
- 			db_error = env->open (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
+ 			db_error = (*env->open) (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
  			if (db_error != 0) {
  				env->close (env, 0);
  				g_warning ("db_env_open failed with %d", db_error);
@@ -2495,7 +2495,7 @@ load_source (EBookBackend *backend,
  			return GNOME_Evolution_Addressbook_OtherError;
  		}
  
- 		db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
+ 		db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
  
  		if (db_error == DB_OLD_VERSION) {
  			db_error = e_db3_utils_upgrade_format (filename);
@@ -2507,7 +2507,7 @@ load_source (EBookBackend *backend,
  				return GNOME_Evolution_Addressbook_OtherError;
  			}
  
- 			db_error = db->open (db, NULL,filename, NULL, DB_HASH, DB_THREAD, 0666);
+ 			db_error = (*db->open) (db, NULL,filename, NULL, DB_HASH, DB_THREAD, 0666);
  		}
  
  		bl->priv->file_db = db;
@@ -2526,7 +2526,7 @@ load_source (EBookBackend *backend,
  					return GNOME_Evolution_Addressbook_OtherError;
  			}
  
- 			db_error = db->open (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
+ 			db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
  			if (db_error != 0) {
  				g_warning ("db->open (...DB_CREATE...) failed with %d", db_error);
  			}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2007 18:23:32 -0000	1.5
+++ .cvsignore	15 Aug 2007 20:15:19 -0000	1.6
@@ -1 +1 @@
-evolution-exchange-2.11.6.1.tar.bz2
+evolution-exchange-2.11.90.tar.bz2


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- evolution-exchange.spec	1 Aug 2007 18:23:32 -0000	1.5
+++ evolution-exchange.spec	15 Aug 2007 20:15:19 -0000	1.6
@@ -23,7 +23,7 @@
 ### Abstract ###
 
 Name: evolution-exchange
-Version: 2.11.6.1
+Version: 2.11.90
 Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
@@ -50,6 +50,9 @@
 # Remove deprecated e_passwords_shutdown().
 Patch15: evolution-exchange-2.11.4-e-passwords.patch
 
+# GNOME bug #466987
+Patch16: evolution-exchange-2.11.90-glibc-open.patch
+
 ### Dependencies ###
 
 Requires: db4
@@ -89,6 +92,7 @@
 %patch13 -p1 -b .no_gnome_common
 %patch14 -p1 -b .fix-library-order
 %patch15 -p1 -b .e-passwords
+%patch16 -p1 -b .glibc-open
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -163,6 +167,10 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Wed Aug 15 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.90-1.fc8
+- Update to 2.11.90
+- Add patch for GNOME bug #466987 (glibc redefines "open").
+
 * Wed Aug 01 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.6.1-1.fc8
 - Update to 2.11.6.1
 - Remove patch for GNOME bug #380534 (fixed upstream).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2007 18:23:32 -0000	1.5
+++ sources	15 Aug 2007 20:15:19 -0000	1.6
@@ -1 +1 @@
-6aac92ab60a82fe6464bd075c992902b  evolution-exchange-2.11.6.1.tar.bz2
+7e2d9a09b51f3ebe3125228f0d5a825e  evolution-exchange-2.11.90.tar.bz2