rpms/evolution/F-8 .cvsignore, 1.80, 1.81 evolution-2.10.0-e-source-combo-box.patch, 1.6, 1.7 evolution.spec, 1.305, 1.306 sources, 1.80, 1.81 evolution-2.12.2-auto-contacts.patch, 1.1, NONE evolution-2.12.2-invalid-include.patch, 1.1, NONE evolution-2.9.1-kill-ememory.patch, 1.4, NONE evolution-2.9.3-meeting-list-view.patch, 1.1, NONE

[Milan Crha (mcrha)]

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6614

Modified Files:
	.cvsignore evolution-2.10.0-e-source-combo-box.patch 
	evolution.spec sources 
Removed Files:
	evolution-2.12.2-auto-contacts.patch 
	evolution-2.12.2-invalid-include.patch 
	evolution-2.9.1-kill-ememory.patch 
	evolution-2.9.3-meeting-list-view.patch 
Log Message:
* Mon Jan 07 2008 Milan Crha <mcrha at redhat.com> - 2.12.3-1.fc8
- Update to 2.12.3
- Removed patch for RH bug #215467 / GNOME bug #380644 (fixed upstream).
- Removed patch for RH bug #404591 / GNOME bug #491062 (fixed upstream).
- Removed patch for RH bug #499920 (fixed upstream).
- Removed patch for GNOME bug #363695 (causes issues)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore	27 Nov 2007 12:18:33 -0000	1.80
+++ .cvsignore	7 Jan 2008 17:31:48 -0000	1.81
@@ -1 +1 @@
-evolution-2.12.2.tar.bz2
+evolution-2.12.3.tar.bz2

evolution-2.10.0-e-source-combo-box.patch:

Index: evolution-2.10.0-e-source-combo-box.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution-2.10.0-e-source-combo-box.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evolution-2.10.0-e-source-combo-box.patch	17 Sep 2007 20:05:20 -0000	1.6
+++ evolution-2.10.0-e-source-combo-box.patch	7 Jan 2008 17:31:48 -0000	1.7
@@ -255,15 +255,6 @@
  int
  e_plugin_lib_enable (EPluginLib *ep, int enable)
  {
-@@ -266,8 +305,6 @@ bbdb_open_addressbook (int type)
- 	char        *uri;
- 	EBook       *book = NULL;
- 
--	gboolean     enable;
--
- 	gboolean     status;
- 	GError      *error = NULL;
- 	
 @@ -345,8 +382,23 @@ enable_toggled_cb (GtkWidget *widget, gp
  	
  	gtk_widget_set_sensitive (stuff->option_menu, active);


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- evolution.spec	6 Dec 2007 20:45:54 -0000	1.305
+++ evolution.spec	7 Jan 2008 17:31:48 -0000	1.306
@@ -45,8 +45,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.12.2
-Release: 3%{?dist}
+Version: 2.12.3
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -98,9 +98,6 @@
 # GNOME bug #362638
 Patch25: evolution-2.8.1-kill-ethread.patch
 
-# GNOME bug #363695
-Patch26: evolution-2.9.1-kill-ememory.patch
-
 # RH bug #176400
 Patch27: evolution-2.9.1-im-context-reset.patch
 
@@ -110,9 +107,6 @@
 # RH bug #215478 / GNOME bug #383842
 Patch30: evolution-2.9.3-source-path-entry.patch
 
-# RH bug #215467 / GNOME bug #380644
-Patch31: evolution-2.9.3-meeting-list-view.patch
-
 # GNOME bug #376991
 # XXX Disabled due to outstanding issues.
 #Patch33: evolution-2.10.0-e-passwords.patch
@@ -129,12 +123,6 @@
 # GNOME bug #454465
 Patch37: evolution-2.12.1-source-changed-event.patch
 
-# RH bug #404591 / GN-bug #491062
-Patch38: evolution-2.12.2-auto-contacts.patch
-
-# RH bug #499920
-Patch39: evolution-2.12.2-invalid-include.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -269,18 +257,14 @@
 %patch20 -p1 -b .replicated-cjk-input
 %patch21 -p1 -b .deleting-preedit-buffer
 %patch25 -p1 -b .kill-ethread
-%patch26 -p1 -b .kill-ememory
 %patch27 -p1 -b .im-context-reset
 #%patch29 -p1 -b .view-attachment-uri
 %patch30 -p1 -b .source-path-entry
-%patch31 -p1 -b .meeting-list-view
 #%patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
 %patch35 -p1 -b .mail-attachment
 %patch36 -p1 -b .icon-names
 %patch37 -p1 -b .source-changed-event
-%patch38 -p1 -b .auto-contacts
-%patch39 -p1 -b .invalid-include
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -731,6 +715,13 @@
 %dir %{_datadir}/omf/evolution
 
 %changelog
+* Mon Jan 07 2008 Milan Crha <mcrha at redhat.com> - 2.12.3-1.fc8
+- Update to 2.12.3
+- Removed patch for RH bug #215467 / GNOME bug #380644 (fixed upstream).
+- Removed patch for RH bug #404591 / GNOME bug #491062 (fixed upstream).
+- Removed patch for RH bug #499920 (fixed upstream).
+- Removed patch for GNOME bug #363695 (causes issues)
+
 * Thu Dec 06 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.2-3.fc8
 - Add patch for GNOME bug #499920 (invalid #include, mainly for Zimbra).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	27 Nov 2007 12:18:33 -0000	1.80
+++ sources	7 Jan 2008 17:31:48 -0000	1.81
@@ -1 +1 @@
-085d4c3a4360ca8024e6c00a25dc38cf  evolution-2.12.2.tar.bz2
+554698d7387aee82c5f4d4520760503d  evolution-2.12.3.tar.bz2


--- evolution-2.12.2-auto-contacts.patch DELETED ---


--- evolution-2.12.2-invalid-include.patch DELETED ---


--- evolution-2.9.1-kill-ememory.patch DELETED ---


--- evolution-2.9.3-meeting-list-view.patch DELETED ---