rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update to 2.11.3

Browse Source 
- Evolution no longer has versioned file names.
- Remove patch for RH bug #202289 (fixed upstream).
- Remove patch for RH bug #235878 (fixed upstream).
- Remove patch for RH bug #238155 (fixed upstream).
- Remove patch for RH bug #240147 (fixed upstream).
This commit is contained in:
Matthew Barnes 2007-06-04 20:07:28 +00:00
parent 131f47b661
commit 35c407f1aa
12 changed files with 776 additions and 1236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
evolution-2.11.2.tar.bz2 evolution-2.11.3.tar.bz2

357
evolution-2.10.1-check-uri-before-strcmp.patch
View File

@ -1,357 +0,0 @@
--- evolution-2.10.1/plugins/exchange-operations/exchange-config-listener.c.check-uri-before-strcmp 2007-04-09 09:09:13.000000000 -0400
+++ evolution-2.10.1/plugins/exchange-operations/exchange-config-listener.c 2007-05-14 13:34:13.000000000 -0400
@@ -1250,26 +1250,30 @@
exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *account)
{
ESourceList *sl=NULL;
- ESourceGroup *group;
ESource *source;
- GSList *groups, *sources;
+ GSList *groups;
gboolean found_group=FALSE;
sl = e_source_list_new_for_gconf (gc_client, CONF_KEY_CONTACTS);
groups = e_source_list_peek_groups (sl);
for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
- group = E_SOURCE_GROUP (groups->data);
+ ESourceGroup *group = E_SOURCE_GROUP (groups->data);
+
if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
&&
strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
-
- sources = e_source_group_peek_sources (group);
+ GSList *sources = e_source_group_peek_sources (group);
for( ; sources != NULL; sources = g_slist_next (sources)) {
- source = E_SOURCE (sources->data);
- if (g_str_has_prefix (e_source_peek_absolute_uri (source),
- "gal://")) {
+ ESource *source = E_SOURCE (sources->data);
+ const gchar *absolute_uri;
+
+ g_assert (source != NULL);
+ absolute_uri = e_source_peek_absolute_uri (source);
+ if (absolute_uri == NULL)
+ continue;
+ if (g_str_has_prefix (absolute_uri, "gal://")) {
/* Set autocompletion on GAL alone by default */
e_source_set_property (source, "completion", "true");
break;
--- evolution-2.10.1/plugins/groupwise-account-setup/camel-gw-listener.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400
+++ evolution-2.10.1/plugins/groupwise-account-setup/camel-gw-listener.c 2007-05-14 13:34:13.000000000 -0400
@@ -254,10 +254,7 @@
remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri)
{
ESourceList *list;
- ESourceGroup *group;
- ESource *source;
GSList *groups;
- GSList *sources;
gboolean found_group;
GConfClient* client;
GSList *ids;
@@ -271,19 +268,21 @@
found_group = FALSE;
for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
-
- group = E_SOURCE_GROUP (groups->data);
+ ESourceGroup *group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), group_name) == 0 &&
strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX ) == 0) {
-
- sources = e_source_group_peek_sources (group);
+ GSList *sources = e_source_group_peek_sources (group);
for( ; sources != NULL; sources = g_slist_next (sources)) {
-
- source = E_SOURCE (sources->data);
-
- if (strcmp (e_source_peek_relative_uri (source), relative_uri) == 0) {
+ ESource *source = E_SOURCE (sources->data);
+ const gchar *source_relative_uri;
+
+ g_assert (source != NULL);
+ source_relative_uri = e_source_peek_relative_uri (source);
+ if (source_relative_uri == NULL)
+ continue;
+ if (strcmp (source_relative_uri, relative_uri) == 0) {
if (!strcmp (conf_key, CALENDAR_SOURCES))
source_selection_key = SELECTED_CALENDARS;
@@ -328,16 +327,12 @@
modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url)
{
ESourceList *list;
- ESourceGroup *group;
- ESource *source;
GSList *groups;
- GSList *sources;
char *old_relative_uri;
CamelURL *url;
gboolean found_group;
GConfClient* client;
const char *poa_address;
- char *new_relative_uri;
const char *new_poa_address;
url = camel_url_new (old_account_info->source_url, NULL);
@@ -354,20 +349,23 @@
found_group = FALSE;
for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
-
- group = E_SOURCE_GROUP (groups->data);
+ ESourceGroup *group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 &&
strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX) == 0) {
-
- sources = e_source_group_peek_sources (group);
+ GSList *sources = e_source_group_peek_sources (group);
for ( ; sources != NULL; sources = g_slist_next (sources)) {
-
- source = E_SOURCE (sources->data);
-
- if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) {
-
+ ESource *source = E_SOURCE (sources->data);
+ const gchar *source_relative_uri;
+
+ g_assert (source != NULL);
+ source_relative_uri = e_source_peek_relative_uri (source);
+ if (source_relative_uri == NULL)
+ continue;
+ if (strcmp (source_relative_uri, old_relative_uri) == 0) {
+ gchar *new_relative_uri;
+
new_relative_uri = g_strdup_printf ("%s@%s/", new_url->user, new_poa_address);
e_source_group_set_name (group, new_group_name);
e_source_set_relative_uri (source, new_relative_uri);
--- evolution-2.10.1/plugins/hula-account-setup/camel-hula-listener.c.check-uri-before-strcmp 2007-04-09 09:09:14.000000000 -0400
+++ evolution-2.10.1/plugins/hula-account-setup/camel-hula-listener.c 2007-05-14 13:34:13.000000000 -0400
@@ -241,10 +241,7 @@
remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri)
{
ESourceList *list;
- ESourceGroup *group;
- ESource *source;
GSList *groups;
- GSList *sources;
gboolean found_group;
GConfClient* client;
GSList *ids;
@@ -258,19 +255,21 @@
found_group = FALSE;
for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
-
- group = E_SOURCE_GROUP (groups->data);
+ ESourceGroup *group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), group_name) == 0 &&
strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) {
-
- sources = e_source_group_peek_sources (group);
+ GSList *sources = e_source_group_peek_sources (group);
for( ; sources != NULL; sources = g_slist_next (sources)) {
-
- source = E_SOURCE (sources->data);
-
- if (strcmp (e_source_peek_relative_uri (source), relative_uri) == 0) {
+ ESource *source = E_SOURCE (sources->data);
+ const gchar *source_relative_uri;
+
+ g_assert (source != NULL);
+ source_relative_uri = e_source_peek_relative_uri (source);
+ if (source_relative_uri == NULL)
+ continue;
+ if (strcmp (source_relative_uri, relative_uri) == 0) {
if (!strcmp (conf_key, CALENDAR_SOURCES))
source_selection_key = SELECTED_CALENDARS;
@@ -311,15 +310,11 @@
modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url)
{
ESourceList *list;
- ESourceGroup *group;
- ESource *source;
GSList *groups;
- GSList *sources;
char *old_relative_uri;
CamelURL *url;
gboolean found_group;
GConfClient* client;
- char *new_relative_uri;
url = camel_url_new (old_account_info->source_url, NULL);
if (!url->host || strlen (url->host) ==0)
@@ -334,19 +329,23 @@
for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) {
- group = E_SOURCE_GROUP (groups->data);
+ ESourceGroup *group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 &&
strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) {
-
- sources = e_source_group_peek_sources (group);
+ GSList *sources = e_source_group_peek_sources (group);
for ( ; sources != NULL; sources = g_slist_next (sources)) {
-
- source = E_SOURCE (sources->data);
-
- if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) {
-
+ ESource *source = E_SOURCE (sources->data);
+ const gchar *source_relative_uri;
+
+ g_assert (source != NULL);
+ source_relative_uri = e_source_peek_relative_uri (source);
+ if (source_relative_uri == NULL)
+ continue;
+ if (strcmp (source_relative_uri, old_relative_uri) == 0) {
+ gchar *new_relative_uri;
+
new_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", new_url->user, new_url->host, new_url->port, new_url->user);
e_source_group_set_name (group, new_group_name);
e_source_set_relative_uri (source, new_relative_uri);
--- evolution-2.10.1/addressbook/gui/component/addressbook-component.c.check-uri-before-strcmp 2007-04-09 09:07:42.000000000 -0400
+++ evolution-2.10.1/addressbook/gui/component/addressbook-component.c 2007-05-14 13:34:13.000000000 -0400
@@ -118,7 +118,13 @@
GSList *s;
for (s = sources; s; s = s->next) {
ESource *source = E_SOURCE (s->data);
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+ const gchar *relative_uri;
+
+ g_assert (source != NULL);
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri == NULL)
+ continue;
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
personal_source = source;
break;
}
--- evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400
+++ evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c 2007-05-14 13:34:13.000000000 -0400
@@ -472,7 +472,13 @@
GSList *s;
for (s = sources; s; s = s->next) {
ESource *source = E_SOURCE (s->data);
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+ const gchar *relative_uri;
+
+ g_assert (source != NULL);
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri == NULL)
+ continue;
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
*personal_source = g_object_ref (source);
break;
}
--- evolution-2.10.1/calendar/gui/calendar-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400
+++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-14 13:34:13.000000000 -0400
@@ -210,7 +210,13 @@
GSList *s;
for (s = sources; s; s = s->next) {
ESource *source = E_SOURCE (s->data);
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+ const gchar *relative_uri;
+
+ g_assert (source != NULL);
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri == NULL)
+ continue;
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
personal_source = source;
break;
}
--- evolution-2.10.1/calendar/gui/tasks-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400
+++ evolution-2.10.1/calendar/gui/tasks-component.c 2007-05-14 13:34:13.000000000 -0400
@@ -170,7 +170,13 @@
GSList *s;
for (s = sources; s; s = s->next) {
ESource *source = E_SOURCE (s->data);
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+ const gchar *relative_uri;
+
+ g_assert (source != NULL);
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri == NULL)
+ continue;
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
personal_source = source;
break;
}
--- evolution-2.10.1/calendar/gui/memos-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400
+++ evolution-2.10.1/calendar/gui/memos-component.c 2007-05-14 13:34:13.000000000 -0400
@@ -174,7 +174,13 @@
GSList *s;
for (s = sources; s; s = s->next) {
ESource *source = E_SOURCE (s->data);
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+ const gchar *relative_uri;
+
+ g_assert (source != NULL);
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri == NULL)
+ continue;
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
personal_source = source;
break;
}
--- evolution-2.10.1/calendar/gui/migration.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400
+++ evolution-2.10.1/calendar/gui/migration.c 2007-05-14 13:34:13.000000000 -0400
@@ -466,7 +466,13 @@
GSList *s;
for (s = sources; s; s = s->next) {
ESource *source = E_SOURCE (s->data);
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+ const gchar *relative_uri;
+
+ g_assert (source != NULL);
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri == NULL)
+ continue;
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
*personal_source = g_object_ref (source);
break;
}
@@ -562,7 +568,13 @@
GSList *s;
for (s = sources; s; s = s->next) {
ESource *source = E_SOURCE (s->data);
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+ const gchar *relative_uri;
+
+ g_assert (source != NULL);
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri == NULL)
+ continue;
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
*personal_source = g_object_ref (source);
break;
}
@@ -1070,7 +1082,13 @@
GSList *s;
for (s = sources; s; s = s->next) {
ESource *source = E_SOURCE (s->data);
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+ const gchar *relative_uri;
+
+ g_assert (source != NULL);
+ relative_uri = e_source_peek_relative_uri (source);
+ if (relative_uri == NULL)
+ continue;
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
*personal_source = g_object_ref (source);
break;
}

192
evolution-2.10.1-fix-help.patch
View File

@ -1,192 +0,0 @@
--- evolution-2.10.1/widgets/misc/e-multi-config-dialog.c.fix-help 2007-04-09 09:10:24.000000000 -0400
+++ evolution-2.10.1/widgets/misc/e-multi-config-dialog.c 2007-04-13 22:26:25.000000000 -0400
@@ -192,13 +192,12 @@
switch (response_id) {
case GTK_RESPONSE_HELP:
- gnome_help_display_desktop (NULL,
- "evolution-" BASE_VERSION,
- "evolution-" BASE_VERSION ".xml",
- "config-prefs",
- &error);
- if (error != NULL)
+ gnome_help_display (
+ "evolution.xml", "config-prefs", &error);
+ if (error != NULL) {
g_warning ("%s", error->message);
+ g_error_free (error);
+ }
break;
case GTK_RESPONSE_CLOSE:
default:
--- evolution-2.10.1/widgets/misc/e-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/widgets/misc/e-send-options.c 2007-04-13 22:26:25.000000000 -0400
@@ -588,34 +588,32 @@
static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
{
+ ESendOptionsDialogPrivate *priv;
+ ESendOptionsDialog *sod;
+ GError *error = NULL;
- ESendOptionsDialogPrivate *priv;
- ESendOptionsDialog *sod;
- GError *error = NULL;
-
- sod = func_data;
- priv = sod->priv;
-
- switch (state) {
- case GTK_RESPONSE_OK:
- e_send_options_get_widgets_data (sod);
- case GTK_RESPONSE_CANCEL:
- gtk_widget_hide (priv->main);
- gtk_widget_destroy (priv->main);
- g_object_unref (priv->xml);
- break;
- case GTK_RESPONSE_HELP:
- gnome_help_display_desktop (NULL,
- "evolution-" BASE_VERSION,
- "evolution-" BASE_VERSION ".xml",
- priv->help_section,
- &error);
- if (error != NULL)
- g_warning ("%s", error->message);
- break;
- }
- g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
+ sod = func_data;
+ priv = sod->priv;
+
+ switch (state) {
+ case GTK_RESPONSE_OK:
+ e_send_options_get_widgets_data (sod);
+ case GTK_RESPONSE_CANCEL:
+ gtk_widget_hide (priv->main);
+ gtk_widget_destroy (priv->main);
+ g_object_unref (priv->xml);
+ break;
+ case GTK_RESPONSE_HELP:
+ gnome_help_display (
+ "evolution.xml", priv->help_section, &error);
+ if (error != NULL) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+ break;
+ }
+ g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
}
gboolean
--- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c 2007-04-13 22:26:25.000000000 -0400
@@ -191,21 +191,20 @@
switch (state) {
case GTK_RESPONSE_OK:
- exchange_send_options_get_widgets_data (sod);
+ exchange_send_options_get_widgets_data (sod);
case GTK_RESPONSE_CANCEL:
- gtk_widget_hide (priv->main);
- gtk_widget_destroy (priv->main);
- g_object_unref (priv->xml);
- break;
+ gtk_widget_hide (priv->main);
+ gtk_widget_destroy (priv->main);
+ g_object_unref (priv->xml);
+ break;
case GTK_RESPONSE_HELP:
- gnome_help_display_desktop (NULL,
- "evolution-" BASE_VERSION,
- "evolution-" BASE_VERSION ".xml",
- priv->help_section,
- &error);
- if (error != NULL)
- g_warning ("%s", error->message);
- break;
+ gnome_help_display (
+ "evolution.xml", priv->help_section, &error);
+ if (error != NULL) {
+ g_warning ("%s", error->message);
+ g_error_free (error);
+ }
+ break;
}
g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-13 22:26:02.000000000 -0400
@@ -3235,13 +3235,12 @@
{
GError *error = NULL;
- gnome_help_display_desktop (NULL,
- "evolution-" BASE_VERSION,
- "evolution-" BASE_VERSION ".xml",
- "usage-contact-cards",
- &error);
- if (error != NULL)
+ gnome_help_display (
+ "evolution.xml", "usage-contact-cards", &error);
+ if (error != NULL) {
g_warning ("%s", error->message);
+ g_error_free (error);
+ }
}
static GList *
--- evolution-2.10.1/composer/e-msg-composer.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/composer/e-msg-composer.c 2007-04-13 22:26:25.000000000 -0400
@@ -2886,13 +2886,12 @@
GError *error = NULL;
EMsgComposerPrivate *p = composer->priv;
- gnome_help_display_desktop (NULL,
- "evolution-" BASE_VERSION,
- "evolution-" BASE_VERSION ".xml",
- "usage-composer",
- &error);
- if (error != NULL)
+ gnome_help_display (
+ "evolution.xml", "usage-composer", &error);
+ if (error != NULL) {
g_warning ("%s", error->message);
+ g_error_free (error);
+ }
}
--- evolution-2.10.1/shell/e-shell-window.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/shell/e-shell-window.c 2007-04-13 22:26:02.000000000 -0400
@@ -1042,7 +1042,7 @@
bonobo_ui_util_set_ui (priv->ui_component,
PREFIX,
xmlfile,
- "evolution-" BASE_VERSION, NULL);
+ "evolution", NULL);
g_free (xmlfile);
e_shell_window_commands_setup (window);
--- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400
+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c 2007-04-13 22:26:25.000000000 -0400
@@ -1693,13 +1693,12 @@
priv = editor->priv;
- gnome_help_display_desktop (NULL,
- "evolution-" BASE_VERSION,
- "evolution-" BASE_VERSION ".xml",
- priv->help_section,
- &error);
- if (error != NULL)
+ gnome_help_display (
+ "evolution.xml", priv->help_section, &error);
+ if (error != NULL) {
g_warning ("%s", error->message);
+ g_error_free (error);
+ }
}

101
evolution-2.10.1-send-recv-dialog.patch
View File

@ -1,101 +0,0 @@
--- evolution-2.11.2/mail/mail-send-recv.c.send-recv-dialog 2007-05-18 16:03:24.000000000 -0400
+++ evolution-2.11.2/mail/mail-send-recv.c 2007-05-18 16:08:58.000000000 -0400
@@ -362,23 +362,6 @@
return SEND_INVALID;
}
-static gboolean
-dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table)
-{
- int h, w;
-
- w = table->allocation.width + 30 /* Spacing around the table */;
- h = table->allocation.height + 60 /* Cancell All button and Seperator and outer spacing */;
-
- if (w > 750)
- w = 750;
- if (h > 400)
- h = 400;
- gtk_widget_set_size_request (window, w, h);
-
- return FALSE;
-}
-
static struct _send_data *
build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination)
{
@@ -444,7 +427,7 @@
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (
GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_add_with_viewport (
GTK_SCROLLED_WINDOW (scrolled_window), table);
@@ -504,6 +487,8 @@
"stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR);
pretty_url = format_url (source->url, account->name);
label = gtk_label_new (NULL);
+ gtk_label_set_ellipsize (
+ GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_label_set_markup (GTK_LABEL (label), pretty_url);
g_free (pretty_url);
@@ -522,16 +507,16 @@
gtk_table_attach (
GTK_TABLE (table), recv_icon,
- 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ 0, 1, row, row+2, 0, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (table), label,
1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (table), progress_bar,
- 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ 2, 3, row, row+2, 0, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (table), cancel_button,
- 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ 3, 4, row, row+2, 0, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (table), status_label,
1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
@@ -572,6 +557,8 @@
"stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR);
pretty_url = format_url (destination, NULL);
label = gtk_label_new (NULL);
+ gtk_label_set_ellipsize (
+ GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_label_set_markup (GTK_LABEL (label), pretty_url);
g_free (pretty_url);
@@ -587,16 +574,16 @@
gtk_table_attach (
GTK_TABLE (table), send_icon,
- 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ 0, 1, row, row+2, 0, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (table), label,
1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (table), progress_bar,
- 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ 2, 3, row, row+2, 0, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (table), cancel_button,
- 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ 3, 4, row, row+2, 0, 0, 0, 0);
gtk_table_attach (
GTK_TABLE (table), status_label,
1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
@@ -615,7 +602,6 @@
gtk_widget_show (GTK_WIDGET (gd));
g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data);
- g_signal_connect (gd, "map-event", G_CALLBACK (dialog_map), table);
g_object_weak_ref ((GObject *) gd, (GWeakNotify) dialog_destroy_cb, data);

10
evolution-2.11.3-implicit-function-declaration.patch Normal file
View File

@ -0,0 +1,10 @@
--- evolution-2.11.3/mail/mail-ops.h.implicit-function-declaration 2007-06-04 13:52:57.000000000 -0400
+++ evolution-2.11.3/mail/mail-ops.h 2007-06-04 13:53:23.000000000 -0400
@@ -156,6 +156,7 @@ void mail_prep_offline(const char *uri,
int mail_store_set_offline(CamelStore *store, gboolean offline,
void (*done)(CamelStore *, void *data),
void *data);
+int mail_store_prepare_offline (CamelStore *store);
/* filter driver execute shell command async callback */
void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data);

4
evolution-2.4.1-hide-switcher-buttons-by-default.patch
View File

@ -1,5 +1,5 @@
--- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in.hide-switcher-buttons-by-default 2005-10-26 16:21:15.000000000 -0400 --- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.hide-switcher-buttons-by-default 2005-10-26 16:21:15.000000000 -0400
+++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in 2005-10-26 16:21:22.000000000 -0400 +++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in 2005-10-26 16:21:22.000000000 -0400
@@ -99,7 +99,7 @@ @@ -99,7 +99,7 @@
<applyto>/apps/evolution/shell/view_defaults/buttons_visible</applyto> <applyto>/apps/evolution/shell/view_defaults/buttons_visible</applyto>
<owner>evolution</owner> <owner>evolution</owner>

72
evolution-2.5.4-fix-conduit-dir.patch
View File

@ -1,88 +1,88 @@
--- evolution-2.9.5/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-01-03 10:32:47.000000000 -0500 --- evolution-2.11.3/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-06-03 11:07:44.000000000 -0400
+++ evolution-2.9.5/addressbook/conduit/Makefile.am 2007-01-21 22:05:23.000000000 -0500 +++ evolution-2.11.3/addressbook/conduit/Makefile.am 2007-06-04 12:55:32.000000000 -0400
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@ e-address.conduit: e-address.conduit.in
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
$< > $@ $< > $@
-conduitdir = $(datadir)/gnome-pilot/conduits/ -conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/
conduit_DATA = e-address-$(BASE_VERSION).conduit conduit_DATA = e-address.conduit
BUILT_SOURCES = $(conduit_DATA) BUILT_SOURCES = $(conduit_DATA)
--- evolution-2.9.5/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-01-21 22:05:44.000000000 -0500 --- evolution-2.11.3/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-06-04 07:36:46.000000000 -0400
+++ evolution-2.9.5/addressbook/conduit/Makefile.in 2007-01-21 22:06:04.000000000 -0500 +++ evolution-2.11.3/addressbook/conduit/Makefile.in 2007-06-04 12:55:53.000000000 -0400
@@ -459,7 +459,7 @@ @@ -459,7 +459,7 @@ libeaddress_conduit_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
-conduitdir = $(datadir)/gnome-pilot/conduits/ -conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/
conduit_DATA = e-address-$(BASE_VERSION).conduit conduit_DATA = e-address.conduit
BUILT_SOURCES = $(conduit_DATA) BUILT_SOURCES = $(conduit_DATA)
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
--- evolution-2.9.5/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 --- evolution-2.11.3/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400
+++ evolution-2.9.5/calendar/conduits/todo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 +++ evolution-2.11.3/calendar/conduits/todo/Makefile.am 2007-06-04 12:56:19.000000000 -0400
@@ -24,7 +24,7 @@ @@ -25,7 +25,7 @@ e-todo.conduit: e-todo.conduit.in
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
$< > $@ $< > $@
-conduitdir = $(datadir)/gnome-pilot/conduits/ -conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/
conduit_DATA = e-todo-$(BASE_VERSION).conduit conduit_DATA = e-todo.conduit
BUILT_SOURCES = $(conduit_DATA) BUILT_SOURCES = $(conduit_DATA)
--- evolution-2.9.5/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:31.000000000 -0500 --- evolution-2.11.3/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-06-04 07:36:51.000000000 -0400
+++ evolution-2.9.5/calendar/conduits/todo/Makefile.in 2007-01-21 22:06:39.000000000 -0500 +++ evolution-2.11.3/calendar/conduits/todo/Makefile.in 2007-06-04 12:56:28.000000000 -0400
@@ -454,7 +454,7 @@ @@ -456,7 +456,7 @@ libetodo_conduit_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS) $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-conduitdir = $(datadir)/gnome-pilot/conduits/ -conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/
conduit_DATA = e-todo-$(BASE_VERSION).conduit conduit_DATA = e-todo.conduit
BUILT_SOURCES = $(conduit_DATA) BUILT_SOURCES = $(conduit_DATA)
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
--- evolution-2.9.5/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 --- evolution-2.11.3/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400
+++ evolution-2.9.5/calendar/conduits/memo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 +++ evolution-2.11.3/calendar/conduits/memo/Makefile.am 2007-06-04 12:56:49.000000000 -0400
@@ -24,7 +24,7 @@ @@ -25,7 +25,7 @@ e-memo.conduit: e-memo.conduit.in
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
$< > $@ $< > $@
-conduitdir = $(datadir)/gnome-pilot/conduits/ -conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/
conduit_DATA = e-memo-$(BASE_VERSION).conduit conduit_DATA = e-memo.conduit
BUILT_SOURCES = $(conduit_DATA) BUILT_SOURCES = $(conduit_DATA)
--- evolution-2.9.5/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:46.000000000 -0500 --- evolution-2.11.3/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-06-04 07:36:50.000000000 -0400
+++ evolution-2.9.5/calendar/conduits/memo/Makefile.in 2007-01-21 22:06:54.000000000 -0500 +++ evolution-2.11.3/calendar/conduits/memo/Makefile.in 2007-06-04 12:56:40.000000000 -0400
@@ -454,7 +454,7 @@ @@ -456,7 +456,7 @@ libememo_conduit_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS) $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-conduitdir = $(datadir)/gnome-pilot/conduits/ -conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/
conduit_DATA = e-memo-$(BASE_VERSION).conduit conduit_DATA = e-memo.conduit
BUILT_SOURCES = $(conduit_DATA) BUILT_SOURCES = $(conduit_DATA)
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
--- evolution-2.9.5/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 --- evolution-2.11.3/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400
+++ evolution-2.9.5/calendar/conduits/calendar/Makefile.am 2007-01-21 22:05:23.000000000 -0500 +++ evolution-2.11.3/calendar/conduits/calendar/Makefile.am 2007-06-04 12:57:02.000000000 -0400
@@ -24,7 +24,7 @@ @@ -25,7 +25,7 @@ e-calendar.conduit: e-calendar.conduit.i
-e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
$< > $@ $< > $@
-conduitdir = $(datadir)/gnome-pilot/conduits/ -conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/
conduit_DATA = e-calendar-$(BASE_VERSION).conduit conduit_DATA = e-calendar.conduit
BUILT_SOURCES = $(conduit_DATA) BUILT_SOURCES = $(conduit_DATA)
--- evolution-2.9.5/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-01-21 22:06:15.000000000 -0500 --- evolution-2.11.3/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-06-04 07:36:50.000000000 -0400
+++ evolution-2.9.5/calendar/conduits/calendar/Makefile.in 2007-01-21 22:06:23.000000000 -0500 +++ evolution-2.11.3/calendar/conduits/calendar/Makefile.in 2007-06-04 12:57:11.000000000 -0400
@@ -456,7 +456,7 @@ @@ -458,7 +458,7 @@ libecalendar_conduit_la_LIBADD = \
$(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \
$(EVOLUTION_CALENDAR_CONDUIT_LIBS) $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
-conduitdir = $(datadir)/gnome-pilot/conduits/ -conduitdir = $(datadir)/gnome-pilot/conduits/
+conduitdir = $(libdir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/
conduit_DATA = e-calendar-$(BASE_VERSION).conduit conduit_DATA = e-calendar.conduit
BUILT_SOURCES = $(conduit_DATA) BUILT_SOURCES = $(conduit_DATA)
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)

11
evolution-2.7.92-fix-prgname.patch
View File

@ -1,11 +0,0 @@
--- evolution-2.7.92/shell/main.c.fix-prgname 2006-08-28 11:04:44.000000000 -0400
+++ evolution-2.7.92/shell/main.c 2006-08-28 11:04:56.000000000 -0400
@@ -516,7 +516,7 @@
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
- program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv,
+ program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv,
GNOME_PROGRAM_STANDARD_PROPERTIES,
GNOME_PARAM_GOPTION_CONTEXT, context,
GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),

1175
evolution-2.8.1-kill-ethread.patch
View File

File diff suppressed because it is too large Load Diff

2
evolution-2.9.1-kill-ememory.patch
View File

@ -56,7 +56,7 @@
- const unsigned char *subject; - const unsigned char *subject;
- -
- subject = (const unsigned char *) string; - subject = (const unsigned char *) string;
- while (!g_ascii_strncasecmp (subject, "Re:", 3)) { - while (!g_ascii_strncasecmp ((char *)subject, "Re:", 3)) {
- subject += 3; - subject += 3;
- -
- /* jump over any spaces */ - /* jump over any spaces */

84
evolution.spec
View File

@ -44,8 +44,8 @@
### Abstract ### ### Abstract ###
Name: evolution Name: evolution
Version: 2.11.2 Version: 2.11.3
Release: 2%{?dist} Release: 1%{?dist}
License: GPL License: GPL
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite Summary: GNOME's next-generation groupware suite
@ -95,9 +95,6 @@ Patch20: evolution-2.7.3-replicated-cjk-input.patch
# RH bug #178295 / GNOME bug #348638 # RH bug #178295 / GNOME bug #348638
Patch21: evolution-2.7.4-deleting-preedit-buffer.patch Patch21: evolution-2.7.4-deleting-preedit-buffer.patch
# RH bug #202289
Patch22: evolution-2.7.92-fix-prgname.patch
# RH bug #161885 / GNOME bug #309166 # RH bug #161885 / GNOME bug #309166
Patch23: evolution-2.8.0-indic-cursor-movement.patch Patch23: evolution-2.8.0-indic-cursor-movement.patch
@ -134,14 +131,8 @@ Patch33: evolution-2.10.0-e-passwords.patch
# GNOME bug #417999 # GNOME bug #417999
Patch34: evolution-2.10.0-e-source-combo-box.patch Patch34: evolution-2.10.0-e-source-combo-box.patch
# RH bug #235878 / GNOME bug #386503 # Upstream really needs to use -Werror-implicit-function-declaration.
Patch35: evolution-2.10.1-fix-help.patch Patch35: evolution-2.11.3-implicit-function-declaration.patch
# RH bug #238155 / GNOME bug #427232
Patch36: evolution-2.10.1-check-uri-before-strcmp.patch
# RH bug #240147 / GNOME bug #335241
Patch37: evolution-2.10.1-send-recv-dialog.patch
## Dependencies ### ## Dependencies ###
@ -270,7 +261,6 @@ Development files needed for building things which link against evolution.
%patch19 -p1 -b .candidate-window-position-calendar %patch19 -p1 -b .candidate-window-position-calendar
%patch20 -p1 -b .replicated-cjk-input %patch20 -p1 -b .replicated-cjk-input
%patch21 -p1 -b .deleting-preedit-buffer %patch21 -p1 -b .deleting-preedit-buffer
%patch22 -p1 -b .fix-prgname
%patch23 -p1 -b .indic-cursor-movement %patch23 -p1 -b .indic-cursor-movement
%patch24 -p1 -b .fix-indic-printing %patch24 -p1 -b .fix-indic-printing
%patch25 -p1 -b .kill-ethread %patch25 -p1 -b .kill-ethread
@ -283,9 +273,7 @@ Development files needed for building things which link against evolution.
%patch32 -p1 -b .view-message-source %patch32 -p1 -b .view-message-source
%patch33 -p1 -b .e-passwords %patch33 -p1 -b .e-passwords
%patch34 -p1 -b .e-source-combo-box %patch34 -p1 -b .e-source-combo-box
%patch35 -p1 -b .fix-help %patch35 -p1 -b .implicit-function-declaration
%patch36 -p1 -b .check-uri-before-strcmp
%patch37 -p1 -b .send-recv-dialog
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -428,9 +416,6 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop
rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
# evolution link
ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
done done
@ -442,12 +427,13 @@ scrollkeeper-update -q
touch --no-create %{_datadir}/icons/hicolor || : touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
%postun %postun
/sbin/ldconfig /sbin/ldconfig
@ -463,15 +449,15 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS COPYING ChangeLog NEWS README %doc AUTHORS COPYING ChangeLog NEWS README
# GConf schemas: # GConf schemas:
%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas
%{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
%{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
%{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
%{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
%{_sysconfdir}/gconf/schemas/evolution-mail.schemas
# The main executable and a symlink: # The main executable
%{_bindir}/evolution-%{evo_major}
%{_bindir}/evolution %{_bindir}/evolution
# Desktop files: # Desktop files:
@ -506,11 +492,11 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/evolution/%{evo_major} %{_datadir}/evolution/%{evo_major}
# Bonobo components: # Bonobo components:
%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook_%{evo_major}.server %{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook.server
%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_%{evo_major}.server %{_libdir}/bonobo/servers/GNOME_Evolution_Calendar.server
%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%{evo_major}.server %{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
%{_libdir}/bonobo/servers/GNOME_Evolution_Mail_%{evo_major}.server %{_libdir}/bonobo/servers/GNOME_Evolution_Mail.server
%{_libdir}/bonobo/servers/GNOME_Evolution_Shell_%{evo_major}.server %{_libdir}/bonobo/servers/GNOME_Evolution_Shell.server
%dir %{_libdir}/evolution %dir %{_libdir}/evolution
%dir %{_libdir}/evolution/%{evo_major} %dir %{_libdir}/evolution/%{evo_major}
%dir %{_libdir}/evolution/%{evo_major}/components %dir %{_libdir}/evolution/%{evo_major}/components
@ -556,16 +542,16 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/evolution/%{evo_major}/conduits %dir %{_libdir}/evolution/%{evo_major}/conduits
%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
%{_libdir}/gnome-pilot/conduits/e-address-%{evo_major}.conduit %{_libdir}/gnome-pilot/conduits/e-address.conduit
%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
%{_libdir}/gnome-pilot/conduits/e-calendar-%{evo_major}.conduit %{_libdir}/gnome-pilot/conduits/e-calendar.conduit
%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
%{_libdir}/gnome-pilot/conduits/e-memo-%{evo_major}.conduit %{_libdir}/gnome-pilot/conduits/e-memo.conduit
%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
%{_libdir}/gnome-pilot/conduits/e-todo-%{evo_major}.conduit %{_libdir}/gnome-pilot/conduits/e-todo.conduit
%endif %endif
# The plugin directory: # The plugin directory:
@ -695,8 +681,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%{_includedir}/evolution-%{evo_major} %{_includedir}/evolution-%{evo_major}
%{_libdir}/pkgconfig/evolution-plugin-%{evo_major}.pc %{_libdir}/pkgconfig/evolution-plugin.pc
%{_libdir}/pkgconfig/evolution-shell-%{evo_major}.pc %{_libdir}/pkgconfig/evolution-shell.pc
%{_libdir}/evolution/%{evo_major}/libeabutil.so %{_libdir}/evolution/%{evo_major}/libeabutil.so
%{_libdir}/evolution/%{evo_major}/libeconduit.so %{_libdir}/evolution/%{evo_major}/libeconduit.so
%{_libdir}/evolution/%{evo_major}/libecontacteditor.so %{_libdir}/evolution/%{evo_major}/libecontacteditor.so
@ -721,6 +707,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so %{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog %changelog
* Mon Jun 04 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-1.fc8
- Update to 2.11.3
- Evolution no longer has versioned file names.
- Remove patch for RH bug #202289 (fixed upstream).
- Remove patch for RH bug #235878 (fixed upstream).
- Remove patch for RH bug #238155 (fixed upstream).
- Remove patch for RH bug #240147 (fixed upstream).
* Thu May 31 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.2-2.fc8 * Thu May 31 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.2-2.fc8
- Evolution no longer requires libgnomeprint[ui]. - Evolution no longer requires libgnomeprint[ui].

2
sources
View File

@ -1 +1 @@
7f684d90627bacd6e4a7997592112484 evolution-2.11.2.tar.bz2 4aa1a1a4b4cf51d64eb259ae3769c8d0 evolution-2.11.3.tar.bz2