diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..34682a7
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1 @@
+evolution-2.5.91.tar.bz2
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 56bb02d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/evolution-*.tar.xz
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..8a15db1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+# Makefile for source rpm: evolution
+# $Id$
+NAME := evolution
+SPECFILE = $(firstword $(wildcard *.spec))
+
+include ../common/Makefile.common
diff --git a/configurable-dbus-prefix.patch b/configurable-dbus-prefix.patch
deleted file mode 100644
index be23739..0000000
--- a/configurable-dbus-prefix.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up evolution-3.48.1 evolution-3.48
-diff -up evolution-3.48.1/docs/evolution.1 evolution-3.48.1/docs/evolution
-diff -up evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c
---- evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 2023-11-27 13:12:25.099463743 -0500
-+++ evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c 2023-11-27 13:14:38.640243434 -0500
-@@ -674,7 +674,7 @@ get_source_manager_reload_command (void)
- g_string_free (tmp, TRUE);
- tmp = NULL;
-
-- base_filename = g_strdup (EDS_SOURCES_DBUS_SERVICE_NAME);
-+ base_filename = g_ascii_strdown (EDS_SOURCES_DBUS_SERVICE_NAME, -1);
-
- if (!base_filename || !*base_filename) {
- g_free (base_filename);
-@@ -690,14 +690,16 @@ get_source_manager_reload_command (void)
-
- while (!tmp) {
- const gchar *name;
-+ gchar *name_down;
-
- name = g_dir_read_name (dir);
-+ name_down = g_ascii_strdown (name, -1);
-
- if (!name)
- break;
-
-- if (g_ascii_strncasecmp (name, base_filename, base_filename_len) == 0 &&
-- g_ascii_strncasecmp (name + strlen (name) - 8, ".service", 8) == 0) {
-+ if (strstr (name_down, base_filename) != NULL &&
-+ strncmp (name_down + strlen (name) - 8, ".service", 8) == 0) {
- gchar *filename;
-
- filename = g_strconcat ("$DBUSDATADIR", G_DIR_SEPARATOR_S, name, NULL);
-@@ -724,6 +726,8 @@ get_source_manager_reload_command (void)
- g_free (str);
- }
- }
-+
-+ g_free (name_down);
- }
-
- g_free (base_filename);
diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch
new file mode 100644
index 0000000..47cafbd
--- /dev/null
+++ b/evolution-1.4.4-ldap-x86_64-hack.patch
@@ -0,0 +1,11 @@
+--- evolution-1.4.4/configure.ldaphack 2003-08-05 02:06:26.000000000 -0400
++++ evolution-1.4.4/configure 2003-08-05 02:06:45.000000000 -0400
+@@ -12135,7 +12135,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
diff --git a/evolution-2.0.2-fix-145552.patch b/evolution-2.0.2-fix-145552.patch
new file mode 100644
index 0000000..ad2edf0
--- /dev/null
+++ b/evolution-2.0.2-fix-145552.patch
@@ -0,0 +1,26 @@
+--- evolution-2.0.2/mail/em-utils.c.fix-145552 2004-09-24 11:49:29.000000000 -0400
++++ evolution-2.0.2/mail/em-utils.c 2005-08-02 22:42:04.000000000 -0400
+@@ -1919,10 +1919,22 @@
+ * try to do better with the filename check.
+ */
+
++ /* RH bug 145552: code based on _gnome_vfs_get_mime_type_internal:
++ * So many file types come compressed by gzip
++ * that extensions are more reliable than magic
++ * typing. If the file has a suffix, then use
++ * the type from the suffix:
++ */
+ if (magic_type) {
+ if (name_type
+ && (!strcmp(magic_type, "text/plain")
+- || !strcmp(magic_type, "application/octet-stream")))
++ || !strcmp(magic_type, "application/octet-stream")
++ || !strcmp(magic_type, "application/octet-stream")
++ || !strcmp(magic_type, "application/x-ole-storage")
++ || !strcmp(magic_type, "text/xml")
++ || !strcmp(magic_type, "application/x-bzip")
++ || !strcmp(magic_type, "application/x-gzip")
++ || !strcmp(magic_type, "application/zip")))
+ return name_type;
+ else
+ return magic_type;
diff --git a/evolution-2.4.1-hide-switcher-buttons-by-default.patch b/evolution-2.4.1-hide-switcher-buttons-by-default.patch
new file mode 100644
index 0000000..bada5b5
--- /dev/null
+++ b/evolution-2.4.1-hide-switcher-buttons-by-default.patch
@@ -0,0 +1,11 @@
+--- 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.in 2005-10-26 16:21:22.000000000 -0400
+@@ -99,7 +99,7 @@
+ /apps/evolution/shell/view_defaults/buttons_visible
+ evolution
+ bool
+- TRUE
++ FALSE
+
+ Window buttons are visible
+ Whether the window buttons should be visible.
diff --git a/evolution-2.5.4-fix-conduit-dir.patch b/evolution-2.5.4-fix-conduit-dir.patch
new file mode 100644
index 0000000..e5def8e
--- /dev/null
+++ b/evolution-2.5.4-fix-conduit-dir.patch
@@ -0,0 +1,44 @@
+--- evolution-2.5.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2004-12-02 22:39:53.000000000 -0500
++++ evolution-2.5.4/addressbook/conduit/Makefile.am 2006-01-11 00:21:25.000000000 -0500
+@@ -28,7 +28,7 @@
+ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
+ $< > $@
+
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-address-$(BASE_VERSION).conduit
+
+ BUILT_SOURCES = $(conduit_DATA)
+--- evolution-2.5.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2005-06-26 20:43:06.000000000 -0400
++++ evolution-2.5.4/calendar/conduits/calendar/Makefile.am 2006-01-11 00:21:25.000000000 -0500
+@@ -24,7 +24,7 @@
+ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
+ $< > $@
+
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-calendar-$(BASE_VERSION).conduit
+
+ BUILT_SOURCES = $(conduit_DATA)
+--- evolution-2.5.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2005-06-26 20:43:07.000000000 -0400
++++ evolution-2.5.4/calendar/conduits/todo/Makefile.am 2006-01-11 00:21:25.000000000 -0500
+@@ -24,7 +24,7 @@
+ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
+ $< > $@
+
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-todo-$(BASE_VERSION).conduit
+
+ BUILT_SOURCES = $(conduit_DATA)
+--- evolution-2.5.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2006-01-11 00:22:26.000000000 -0500
++++ evolution-2.5.4/calendar/conduits/memo/Makefile.am 2006-01-11 00:22:39.000000000 -0500
+@@ -24,7 +24,7 @@
+ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \
+ $< > $@
+
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-memo-$(BASE_VERSION).conduit
+
+ BUILT_SOURCES = $(conduit_DATA)
diff --git a/evolution-2.5.4-fix-conduits.patch b/evolution-2.5.4-fix-conduits.patch
new file mode 100644
index 0000000..d718ee2
--- /dev/null
+++ b/evolution-2.5.4-fix-conduits.patch
@@ -0,0 +1,515 @@
+--- evolution-2.5.4/addressbook/conduit/address-conduit.c.fix-conduits 2005-12-08 03:15:02.000000000 -0500
++++ evolution-2.5.4/addressbook/conduit/address-conduit.c 2006-01-10 19:33:44.000000000 -0500
+@@ -462,14 +462,19 @@
+ {
+ static char buff[ 4096 ];
+ struct Address addr;
++ pi_buffer_t piBuf;
+
+ if (remote == NULL) {
+ sprintf (buff, "[NULL]");
+ return buff;
+ }
+
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++
+ memset (&addr, 0, sizeof (struct Address));
+- unpack_Address (&addr, remote->record, remote->length);
++ unpack_Address (&addr, &piBuf, address_v1);
+
+ g_snprintf (buff, 4096, "['%s' '%s' '%s']",
+ addr.entry[entryLastname] ?
+@@ -791,7 +796,8 @@
+ EAddrConduitContext *ctxt)
+ {
+ GnomePilotRecord p;
+- static char record[0xffff];
++ static unsigned char record[0xffff];
++ pi_buffer_t piBuf;
+
+ g_assert (local->addr != NULL );
+
+@@ -803,9 +809,17 @@
+ p.archived = local->local.archived;
+ p.secret = local->local.secret;
+
++ memset (&piBuf, 0, sizeof (piBuf));
++ memset (record, 0, sizeof (record));
++ pack_Address (local->addr, &piBuf, address_v1);
++
+ /* Generate pilot record structure */
++ if (piBuf.used > 0)
++ memcpy (record, piBuf.data, piBuf.used);
+ p.record = record;
+- p.length = pack_Address (local->addr, p.record, 0xffff);
++ p.length = piBuf.used;
++ if (piBuf.data)
++ free (piBuf.data);
+
+ return p;
+ }
+@@ -834,16 +848,16 @@
+ */
+ if (local->local.ID != 0) {
+ struct Address addr;
+- char record[0xffff];
++ pi_buffer_t *buffer = pi_buffer_new (0xffff);
+ int cat = 0;
+
+ if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
+ ctxt->dbi->db_handle,
+- local->local.ID, &record,
+- NULL, NULL, NULL, &cat) > 0) {
++ local->local.ID, buffer,
++ NULL, NULL, &cat) > 0) {
+ local->local.category = cat;
+ memset (&addr, 0, sizeof (struct Address));
+- unpack_Address (&addr, record, 0xffff);
++ unpack_Address (&addr, buffer, address_v1);
+ for (i = 0; i < 5; i++) {
+ if (addr.entry[entryPhone1 + i])
+ local->addr->entry[entryPhone1 + i] =
+@@ -858,6 +872,8 @@
+ }
+ free_Address (&addr);
+ }
++
++ pi_buffer_free (buffer);
+ }
+
+ local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME));
+@@ -1019,10 +1035,16 @@
+ EContactField next_mail, next_home, next_work, next_fax;
+ EContactField next_other, next_main, next_pager, next_mobile;
+ int i;
++ pi_buffer_t piBuf;
+
+ g_return_val_if_fail(remote!=NULL,NULL);
+ memset (&address, 0, sizeof (struct Address));
+- unpack_Address (&address, remote->record, remote->length);
++
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++
++ unpack_Address (&address, &piBuf, address_v1);
+
+ if (in_contact == NULL)
+ contact = e_contact_new ();
+@@ -1212,7 +1234,7 @@
+ EBookQuery *query;
+ GList *l;
+ int len;
+- unsigned char *buf;
++ pi_buffer_t *buffer;
+ char *filename;
+ char *change_id;
+ char *auth;
+@@ -1302,9 +1324,9 @@
+ gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
+ gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
+
+- buf = (unsigned char*)g_malloc (0xffff);
++ buffer = pi_buffer_new (0xffff);
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+- (unsigned char *)buf, 0xffff);
++ -1, buffer);
+
+ if (len < 0) {
+ WARN (_("Could not read pilot's Address application block"));
+@@ -1313,8 +1335,8 @@
+ _("Could not read pilot's Address application block"));
+ return -1;
+ }
+- unpack_AddressAppInfo (&(ctxt->ai), buf, len);
+- g_free (buf);
++ unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len);
++ pi_buffer_free (buffer);
+
+ check_for_slow_setting (conduit, ctxt);
+ if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
+--- evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c.fix-conduits 2006-01-02 06:38:57.000000000 -0500
++++ evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c 2006-01-10 19:33:44.000000000 -0500
+@@ -413,14 +413,20 @@
+ {
+ static char buff[ 4096 ];
+ struct Appointment appt;
++ pi_buffer_t piBuf;
+
+ if (remote == NULL) {
+ sprintf (buff, "[NULL]");
+ return buff;
+ }
+
++
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++
+ memset (&appt, 0, sizeof (struct Appointment));
+- unpack_Appointment (&appt, remote->record, remote->length);
++ unpack_Appointment (&appt, &piBuf, datebook_v1);
+
+ g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']",
+ mktime (&appt.begin),
+@@ -818,7 +824,8 @@
+ ECalConduitContext *ctxt)
+ {
+ GnomePilotRecord p;
+- static char record[0xffff];
++ static unsigned char record[0xffff];
++ pi_buffer_t piBuf;
+
+ g_assert (local->comp != NULL);
+ g_assert (local->appt != NULL );
+@@ -829,9 +836,17 @@
+ p.archived = local->local.archived;
+ p.secret = local->local.secret;
+
++ memset (&piBuf, 0, sizeof (piBuf));
++ memset (record, 0, sizeof (record));
++ pack_Appointment (local->appt, &piBuf, datebook_v1);
++
+ /* Generate pilot record structure */
++ if (piBuf.used > 0)
++ memcpy (record, piBuf.data, piBuf.used);
+ p.record = record;
+- p.length = pack_Appointment (local->appt, p.record, 0xffff);
++ p.length = piBuf.used;
++ if (piBuf.data)
++ free (piBuf.data);
+
+ return p;
+ }
+@@ -867,22 +882,24 @@
+ * we don't overwrite them
+ */
+ if (local->local.ID != 0) {
+- struct Appointment appt;
+- char record[0xffff];
++ struct Appointment appt;
++ pi_buffer_t *buffer = pi_buffer_new (0xffff);
+ int cat = 0;
+
+ if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
+ ctxt->dbi->db_handle,
+- local->local.ID, &record,
+- NULL, NULL, NULL, &cat) > 0) {
++ local->local.ID, buffer,
++ NULL, NULL, &cat) > 0) {
+ local->local.category = cat;
+ memset (&appt, 0, sizeof (struct Appointment));
+- unpack_Appointment (&appt, record, 0xffff);
++ unpack_Appointment (&appt, buffer, datebook_v1);
+ local->appt->alarm = appt.alarm;
+ local->appt->advance = appt.advance;
+ local->appt->advanceUnits = appt.advanceUnits;
+ free_Appointment (&appt);
+ }
++
++ pi_buffer_free (buffer);
+ }
+
+ /* STOP: don't replace these with g_strdup, since free_Appointment
+@@ -1140,11 +1157,17 @@
+ GSList *edl = NULL;
+ char *txt;
+ int pos, i;
++ pi_buffer_t piBuf;
+
+ g_return_val_if_fail (remote != NULL, NULL);
+
++
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++
+ memset (&appt, 0, sizeof (struct Appointment));
+- unpack_Appointment (&appt, remote->record, remote->length);
++ unpack_Appointment (&appt, &piBuf, datebook_v1);
+
+ if (in_comp == NULL) {
+ comp = e_cal_component_new ();
+@@ -1409,7 +1432,7 @@
+ GnomePilotConduitSyncAbs *abs_conduit;
+ GList *removed = NULL, *added = NULL, *l;
+ int len;
+- unsigned char *buf;
++ pi_buffer_t *buffer;
+ char *filename, *change_id;
+ icalcomponent *icalcomp;
+ gint num_records, add_records = 0, mod_records = 0, del_records = 0;
+@@ -1521,9 +1544,9 @@
+ gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);
+ gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);
+
+- buf = (unsigned char*)g_malloc (0xffff);
++ buffer = pi_buffer_new (0xffff);
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+- (unsigned char *)buf, 0xffff);
++ -1, buffer);
+
+ if (len < 0) {
+ WARN (_("Could not read pilot's Calendar application block"));
+@@ -1532,8 +1555,8 @@
+ _("Could not read pilot's Calendar application block"));
+ return -1;
+ }
+- unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
+- g_free (buf);
++ unpack_AppointmentAppInfo (&(ctxt->ai), buffer->data, len);
++ pi_buffer_free (buffer);
+
+ check_for_slow_setting (conduit, ctxt);
+ if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
+--- evolution-2.5.4/calendar/conduits/todo/todo-conduit.c.fix-conduits 2005-12-08 03:15:03.000000000 -0500
++++ evolution-2.5.4/calendar/conduits/todo/todo-conduit.c 2006-01-10 19:33:44.000000000 -0500
+@@ -402,14 +402,19 @@
+ {
+ static char buff[ 4096 ];
+ struct ToDo todo;
++ pi_buffer_t piBuf;
+
+ if (remote == NULL) {
+ sprintf (buff, "[NULL]");
+ return buff;
+ }
+
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++
+ memset (&todo, 0, sizeof (struct ToDo));
+- unpack_ToDo (&todo, remote->record, remote->length);
++ unpack_ToDo (&todo, &piBuf, todo_v1);
+
+ g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]",
+ todo.indefinite,
+@@ -594,7 +599,8 @@
+ EToDoConduitContext *ctxt)
+ {
+ GnomePilotRecord p;
+- static char record[0xffff];
++ static unsigned char record[0xffff];
++ pi_buffer_t piBuf;
+
+ g_assert (local->comp != NULL);
+ g_assert (local->todo != NULL );
+@@ -607,9 +613,17 @@
+ p.archived = local->local.archived;
+ p.secret = local->local.secret;
+
++ memset (&piBuf, 0, sizeof (piBuf));
++ memset (record, 0, sizeof (record));
++ pack_ToDo (local->todo, &piBuf, todo_v1);
++
+ /* Generate pilot record structure */
++ if (piBuf.used > 0)
++ memcpy (record, piBuf.data, piBuf.used);
+ p.record = record;
+- p.length = pack_ToDo (local->todo, p.record, 0xffff);
++ p.length = piBuf.used;
++ if (piBuf.data)
++ free (piBuf.data);
+
+ return p;
+ }
+@@ -696,15 +710,17 @@
+
+ /* Don't overwrite the category */
+ if (local->local.ID != 0) {
+- char record[0xffff];
++ pi_buffer_t *buffer = pi_buffer_new (0xffff);
+ int cat = 0;
+
+ if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
+ ctxt->dbi->db_handle,
+- local->local.ID, &record,
+- NULL, NULL, NULL, &cat) > 0) {
++ local->local.ID, buffer,
++ NULL, NULL, &cat) > 0) {
+ local->local.category = cat;
+ }
++
++ pi_buffer_free (buffer);
+ }
+
+ /*
+@@ -859,12 +875,17 @@
+ icaltimezone *utc_zone;
+ int priority;
+ char *txt;
++ pi_buffer_t piBuf;
+ char *category;
+
+ g_return_val_if_fail (remote != NULL, NULL);
+
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++
+ memset (&todo, 0, sizeof (struct ToDo));
+- unpack_ToDo (&todo, remote->record, remote->length);
++ unpack_ToDo (&todo, &piBuf, todo_v1);
+
+ utc_zone = icaltimezone_get_utc_timezone ();
+ now = icaltime_from_timet_with_zone (time (NULL), FALSE,
+@@ -1014,7 +1035,7 @@
+ GnomePilotConduitSyncAbs *abs_conduit;
+ GList *l;
+ int len;
+- unsigned char *buf;
++ pi_buffer_t *buffer;
+ char *filename, *change_id;
+ icalcomponent *icalcomp;
+ gint num_records, add_records = 0, mod_records = 0, del_records = 0;
+@@ -1104,9 +1125,9 @@
+ g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
+ num_records, add_records, mod_records, del_records);
+
+- buf = (unsigned char*)g_malloc (0xffff);
++ buffer = pi_buffer_new (0xffff);
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+- (unsigned char *)buf, 0xffff);
++ -1, buffer);
+
+ if (len < 0) {
+ WARN (_("Could not read pilot's ToDo application block"));
+@@ -1115,8 +1136,8 @@
+ _("Could not read pilot's ToDo application block"));
+ return -1;
+ }
+- unpack_ToDoAppInfo (&(ctxt->ai), buf, len);
+- g_free (buf);
++ unpack_ToDoAppInfo (&(ctxt->ai), buffer->data, len);
++ pi_buffer_free (buffer);
+
+ lastDesktopUniqueID = 128;
+
+--- evolution-2.5.4/calendar/conduits/memo/memo-conduit.c.fix-conduits 2006-01-10 22:52:28.000000000 -0500
++++ evolution-2.5.4/calendar/conduits/memo/memo-conduit.c 2006-01-10 23:11:47.000000000 -0500
+@@ -331,14 +331,19 @@
+ {
+ static char buff[ 64 ];
+ struct Memo memo;
++ pi_buffer_t piBuf;
+
+ if (remote == NULL) {
+ sprintf (buff, "[NULL]");
+ return buff;
+ }
+
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++
+ memset (&memo, 0, sizeof (struct Memo));
+- unpack_Memo (&memo, remote->record, remote->length);
++ unpack_Memo (&memo, &piBuf, memo_v1);
+
+ g_snprintf (buff, 64, "['%s']",
+ memo.text ?
+@@ -451,7 +456,8 @@
+ EMemoConduitContext *ctxt)
+ {
+ GnomePilotRecord p;
+- static char record[0xffff];
++ static unsigned char record[0xffff];
++ pi_buffer_t piBuf;
+
+ g_assert (local->comp != NULL);
+ g_assert (local->memo != NULL );
+@@ -466,8 +472,14 @@
+
+ /* Generate pilot record structure */
+ p.record = record;
+- p.length = pack_Memo (local->memo, p.record, 0xffff);
+-
++ memset (&piBuf, 0, sizeof (piBuf));
++ memset (record, 0, sizeof (record));
++ p.length = pack_Memo (local->memo, &piBuf, memo_v1);
++ if (piBuf.used > 0)
++ memcpy (record, piBuf.data, piBuf.used);
++ p.length = piBuf.used;
++ if (piBuf.data)
++ free (piBuf.data);
+ return p;
+ }
+
+@@ -568,16 +580,17 @@
+
+ /* Don't overwrite the category */
+ if (local->local.ID != 0) {
+- char record[0xffff];
++ pi_buffer_t *buffer = pi_buffer_new (0xffff);
+ int cat = 0;
+
+ LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n"));
+ if (dlp_ReadRecordById (ctxt->dbi->pilot_socket,
+ ctxt->dbi->db_handle,
+- local->local.ID, &record,
+- NULL, NULL, NULL, &cat) > 0) {
++ local->local.ID, buffer,
++ NULL, NULL, &cat) > 0) {
+ local->local.category = cat;
+ }
++ pi_buffer_free (buffer);
+ LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n"));
+ }
+
+@@ -699,6 +712,7 @@
+ {
+ ECalComponent *comp;
+ struct Memo memo;
++ pi_buffer_t piBuf;
+ struct icaltimetype now;
+ icaltimezone *utc_zone;
+ char *txt, *txt2, *txt3;
+@@ -707,8 +721,12 @@
+
+ g_return_val_if_fail (remote != NULL, NULL);
+
++ piBuf.data = remote->record;
++ piBuf.allocated = remote->length;
++ piBuf.used = remote->length;
++
+ memset (&memo, 0, sizeof (struct Memo));
+- unpack_Memo (&memo, remote->record, remote->length);
++ unpack_Memo (&memo, &piBuf, memo_v1);
+
+ utc_zone = icaltimezone_get_utc_timezone ();
+ now = icaltime_from_timet_with_zone (time (NULL), FALSE,
+@@ -836,7 +854,7 @@
+ GnomePilotConduitSyncAbs *abs_conduit;
+ GList *l;
+ int len;
+- unsigned char *buf;
++ pi_buffer_t *buffer;
+ char *filename, *change_id;
+ icalcomponent *icalcomp;
+ gint num_records, add_records = 0, mod_records = 0, del_records = 0;
+@@ -929,9 +947,9 @@
+ g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n",
+ num_records, add_records, mod_records, del_records);
+
+- buf = (unsigned char*)g_malloc (0xffff);
++ buffer = pi_buffer_new (0xffff);
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+- (unsigned char *)buf, 0xffff);
++ -1, buffer);
+
+ if (len < 0) {
+ WARN (_("Could not read pilot's Memo application block"));
+@@ -940,8 +958,8 @@
+ _("Could not read pilot's Memo application block"));
+ return -1;
+ }
+- unpack_MemoAppInfo (&(ctxt->ai), buf, len);
+- g_free (buf);
++ unpack_MemoAppInfo (&(ctxt->ai), buffer->data, len);
++ pi_buffer_free (buffer);
+
+ lastDesktopUniqueID = 128;
+
diff --git a/evolution-2.5.5.1-commit-enter-on-calendar.patch b/evolution-2.5.5.1-commit-enter-on-calendar.patch
new file mode 100644
index 0000000..84e58f2
--- /dev/null
+++ b/evolution-2.5.5.1-commit-enter-on-calendar.patch
@@ -0,0 +1,242 @@
+--- evolution-2.5.5.1/calendar/gui/e-day-view.c.commit-enter-on-calendar 2006-01-16 09:42:17.000000000 -0500
++++ evolution-2.5.5.1/calendar/gui/e-day-view.c 2006-01-25 23:48:24.000000000 -0500
+@@ -334,6 +334,10 @@
+ gint event_num,
+ gchar *initial_text);
+ static void e_day_view_stop_editing_event (EDayView *day_view);
++static gboolean e_day_view_text_keypress (GnomeCanvasItem *item,
++ guint keyval,
++ guint state,
++ EDayView *day_view);
+ static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item,
+ GdkEvent *event,
+ EDayView *day_view);
+@@ -4484,6 +4488,8 @@
+ G_CALLBACK (e_day_view_on_text_item_event), day_view);
+ g_signal_emit_by_name (G_OBJECT(day_view),
+ "event_added", event);
++ g_signal_connect (event->canvas_item, "keypress",
++ G_CALLBACK (e_day_view_text_keypress), day_view);
+
+ e_day_view_update_long_event_label (day_view, event_num);
+ }
+@@ -4667,6 +4673,8 @@
+ G_CALLBACK (e_day_view_on_text_item_event), day_view);
+ g_signal_emit_by_name (G_OBJECT(day_view),
+ "event_added", event);
++ g_signal_connect (event->canvas_item, "keypress",
++ G_CALLBACK (e_day_view_text_keypress), day_view);
+
+ e_day_view_update_event_label (day_view, day, event_num);
+ }
+@@ -5824,46 +5832,74 @@
+ }
+
+ static gboolean
++e_day_view_text_keypress (GnomeCanvasItem *item,
++ guint keyval,
++ guint state,
++ EDayView *day_view)
++{
++ gboolean retval = FALSE;
++
++ tooltip_destroy (day_view, item);
++
++ if (keyval == GDK_Return) {
++ EText *text = E_TEXT (item);
++ gint new_pos = 0;
++
++ /*
++ * HACK: last character which should be \n needs to be deleted
++ * here so that GDK_Return was already processed on EText
++ * before E_TEXT_KEYPRESS event is emitted.
++ */
++ if (text->selection_end >= 1)
++ new_pos = text->selection_end - 1;
++
++ text->selection_end = e_text_model_validate_position (text->model, new_pos);
++ e_text_delete_selection (text);
++
++ day_view->resize_event_num = -1;
++
++ /* We set the keyboard focus to the EDayView, so the
++ EText item loses it and stops the edit. */
++ gtk_widget_grab_focus (GTK_WIDGET (day_view));
++
++ /* Stop the signal last or we will also stop any
++ other events getting to the EText item. */
++ gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
++ "event");
++
++ retval = TRUE;
++ } else if (keyval == GDK_Escape) {
++ cancel_editing (day_view);
++ gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
++ /* focus should go to day view when stop editing */
++ gtk_widget_grab_focus (GTK_WIDGET (day_view));
++
++ retval = TRUE;
++ } else if ((keyval == GDK_Up)
++ && (state & GDK_SHIFT_MASK)
++ && (state & GDK_CONTROL_MASK)
++ && !(state & GDK_MOD1_MASK)) {
++ e_day_view_change_event_end_time_up (day_view);
++
++ retval = TRUE;
++ } else if ((keyval == GDK_Down)
++ && (state & GDK_SHIFT_MASK)
++ && (state & GDK_CONTROL_MASK)
++ && !(state & GDK_MOD1_MASK)) {
++ e_day_view_change_event_end_time_down (day_view);
++
++ retval = TRUE;
++ }
++
++ return retval;
++}
++
++static gboolean
+ e_day_view_on_text_item_event (GnomeCanvasItem *item,
+ GdkEvent *event,
+ EDayView *day_view)
+ {
+ switch (event->type) {
+- case GDK_KEY_PRESS:
+- tooltip_destroy (day_view, item);
+- if (event && event->key.keyval == GDK_Return) {
+- day_view->resize_event_num = -1;
+- day_view->resize_event_num = -1;
+-
+- /* We set the keyboard focus to the EDayView, so the
+- EText item loses it and stops the edit. */
+- gtk_widget_grab_focus (GTK_WIDGET (day_view));
+-
+- /* Stop the signal last or we will also stop any
+- other events getting to the EText item. */
+- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
+- "event");
+- return TRUE;
+- } else if (event->key.keyval == GDK_Escape) {
+- cancel_editing (day_view);
+- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+- /* focus should go to day view when stop editing */
+- gtk_widget_grab_focus (GTK_WIDGET (day_view));
+- return TRUE;
+- } else if ((event->key.keyval == GDK_Up)
+- && (event->key.state & GDK_SHIFT_MASK)
+- && (event->key.state & GDK_CONTROL_MASK)
+- && !(event->key.state & GDK_MOD1_MASK)) {
+- e_day_view_change_event_end_time_up (day_view);
+- return TRUE;
+- } else if ((event->key.keyval == GDK_Down)
+- && (event->key.state & GDK_SHIFT_MASK)
+- && (event->key.state & GDK_CONTROL_MASK)
+- && !(event->key.state & GDK_MOD1_MASK)) {
+- e_day_view_change_event_end_time_down (day_view);
+- return TRUE;
+- }
+- break;
+ case GDK_2BUTTON_PRESS:
+ #if 0
+ g_print ("Item got double-click\n");
+--- evolution-2.5.5.1/calendar/gui/e-week-view.c.commit-enter-on-calendar 2006-01-16 09:42:17.000000000 -0500
++++ evolution-2.5.5.1/calendar/gui/e-week-view.c 2006-01-25 23:46:43.000000000 -0500
+@@ -175,6 +175,10 @@
+ const gchar *uid,
+ EWeekViewForeachEventCallback callback,
+ gpointer data);
++static gboolean e_week_view_text_keypress (GnomeCanvasItem *item,
++ guint keyval,
++ guint state,
++ EWeekView *week_view);
+ static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item,
+ GdkEvent *event,
+ EWeekView *week_view);
+@@ -2771,6 +2775,8 @@
+ week_view);
+ g_signal_emit_by_name (G_OBJECT(week_view),
+ "event_added", event);
++ g_signal_connect (span->text_item, "keypress",
++ G_CALLBACK (e_week_view_text_keypress), week_view);
+
+ }
+
+@@ -3028,6 +3034,51 @@
+ }
+
+ static gboolean
++e_week_view_text_keypress (GnomeCanvasItem *item,
++ guint keyval,
++ guint state,
++ EWeekView *week_view)
++{
++ gboolean retval = FALSE;
++
++ tooltip_destroy (week_view, item);
++
++ if (keyval == GDK_Return) {
++ EText *text = E_TEXT (item);
++ gint new_pos = 0;
++
++ /*
++ * HACK: last charater which should be \n needs to be deleted
++ * here so that GDK_Return was already processed on EText
++ * before E_TEXT_KEYPRESS event is emitted.
++ */
++ if (text->selection_end >= 1)
++ new_pos = text->selection_end - 1;
++
++ text->selection_end = e_text_model_validate_position (text->model, new_pos);
++ e_text_delete_selection (text);
++
++ /* We set the keyboard focus to the EDayView, so the
++ EText item loses it and stops the edit. */
++ gtk_widget_grab_focus (GTK_WIDGET (week_view));
++
++ /* Stop the signal last or we will also stop any
++ other events getting to the EText item. */
++ gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
++ "event");
++ retval = TRUE;
++ } else if (keyval == GDK_Escape) {
++ cancel_editing (week_view);
++ gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
++ /* focus should go to week view when stop editing */
++ gtk_widget_grab_focus (GTK_WIDGET (week_view));
++ retval = TRUE;
++ }
++
++ return retval;
++}
++
++static gboolean
+ e_week_view_on_text_item_event (GnomeCanvasItem *item,
+ GdkEvent *gdkevent,
+ EWeekView *week_view)
+@@ -3044,26 +3095,6 @@
+ #endif
+
+ switch (gdkevent->type) {
+- case GDK_KEY_PRESS:
+- tooltip_destroy (week_view, item);
+- if (gdkevent && gdkevent->key.keyval == GDK_Return) {
+- /* We set the keyboard focus to the EDayView, so the
+- EText item loses it and stops the edit. */
+- gtk_widget_grab_focus (GTK_WIDGET (week_view));
+-
+- /* Stop the signal last or we will also stop any
+- other events getting to the EText item. */
+- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
+- "event");
+- return TRUE;
+- } else if (gdkevent->key.keyval == GDK_Escape) {
+- cancel_editing (week_view);
+- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+- /* focus should go to week view when stop editing */
+- gtk_widget_grab_focus (GTK_WIDGET (week_view));
+- return TRUE;
+- }
+- break;
+ case GDK_2BUTTON_PRESS:
+ if (!e_week_view_find_event_from_item (week_view, item,
+ &event_num, &span_num))
diff --git a/evolution.spec b/evolution.spec
index 527cd79..c7ce30a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,603 +1,1673 @@
-%undefine __cmake_in_source_build
-
-%global _changelog_trimtime %(date +%s -d "1 year ago")
-%global _python_bytecompile_extra 0
-
-# correct Obsoletes for evolution-tests when this is changed
-%global enable_installed_tests 0
-
-%global tnef_support 0
-%if 0%{?fedora}
-%global tnef_support 1
-%endif
-
-%define glib2_version 2.66
-%define gtk3_version 3.22
-%define gnome_autoar_version 0.1.1
-%define gnome_desktop_version 2.91.3
-%define intltool_version 0.35.5
-%define libgweather_version 3.91
-%define geocode_glib_version 3.26.3
-%define sqlite_version 3.7.17
-%define libsoup_version 3.1.1
-%define webkit2gtk_version 2.34.0
-
-%define last_anjal_version 0.3.2-3
+%define gtkhtml_version 3.9.2
+%define soup_version 2.2.2
+%define eds_version 1.5.91
+%define use_mozilla_nss 1
+%define evo_major 2.6
+%define libbonoboui_version 2.4.2
+%define orbit2_version 2.9.8
+%define gnome_icon_theme_version 1.3.6
+%define libgnomeprint22_version 2.8.0
+%define dbus_version 0.31
+%define gnomevfs2_version 2.4
%define last_libgal2_version 2:2.5.3-2
-%define last_evo_nm_version 3.5.0
-%define last_evo_perl_version 3.21.90
+
+%define pilot_link_version 0.12.0
+%define gnome_pilot_version 2.0.13
%define ldap_support 1
-%define libnotify_support 1
-%define libpst_support 1
-
-# Coverity scan can override this to 0, to skip checking in gtk-doc generated code
-%{!?with_docs: %global with_docs 1}
-
-%if 0%{?flatpak}
-%global with_docs 0
+%define krb5_support 1
+%ifarch s390 s390x
+%define pilot_support 0
+%else
+%define pilot_support 1
%endif
+# note that nntp is non-functional in evo 1.3.x
+%define nntp_support 1
+%define exchange_support 1
+%define nm_support 1
+%define libnotify_support 1
+%define inline_audio_support 0
-%define evo_plugin_dir %{_libdir}/evolution/plugins
+# Upstream tarballs often contain instances of undeclared functions; these tend
+# to work on i386 but fail on 64-bit architectures. Leave this on to trap the
+# warnings as errors (and ideally get the flag into the upstream build):
+%define require_function_declarations 0
-### Abstract ###
+%define redhat_menus_version 5.0.4
+
+%define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
Name: evolution
-Version: 3.59.1
-Release: 2%{?dist}
-Summary: Mail and calendar client for GNOME
-License: GPL-2.0-or-later AND GFDL-1.3-or-later
-URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
-Source: http://download.gnome.org/sources/%{name}/3.59/%{name}-%{version}.tar.xz
-Source1: flatpak-evolution-fix-service-names.sh
-Source2: flatpak-evolution-wrapper.sh.in
+Version: 2.5.91
+Release: 1.dwmw2.1
+License: GPL
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+URL: http://www.ximian.com/
+Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.1/%{name}-%{version}.tar.bz2
-# 0-99: General patches
-# enable corresponding autopatch below to make them applied
+# patches pulled from upstream CVS
-# 100-199: Flatpak-specific patches
-# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144
-Patch100: configurable-dbus-prefix.patch
+# Red Hat Linux specific patches
+#Patch11: evolution-1.3.2-redhatify.patch
-# Approximate version number
-Provides: bundled(libgnomecanvas) = 2.30.0
+# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/
+#Patch99: db3-dont-use-pthread.patch
+# bad hack
+Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
-Obsoletes: anjal <= %{last_anjal_version}
-Obsoletes: libgal2 <= %{last_libgal2_version}
-Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
-Obsoletes: evolution-perl < %{last_evo_perl_version}
-Obsoletes: evolution-rss < 3.45.2
+# patches sent upstream
+Patch100: evo-addressbook-print-with-pango-2.patch
+Patch101: evo-calendar-print-with-pango-7.patch
-%if !%{enable_installed_tests}
-Obsoletes: evolution-tests <= 3.31.1
-%endif
+#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
-%global eds_version %{version}
+# Fix for RH bug #154360:
+Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch
-## Dependencies ###
+# Move autosave file
+Patch107: evolution-2.5.4-move-autosave-file.patch
-%if ! 0%{?flatpak}
-Requires: %{_bindir}/killall
-Requires: gvfs
-%endif
+# Fix for RH bug 150458:
+Patch108: evolution-2.3.5.1-fix-150458.patch
+
+# Fix for RH bug 164957 (was for 145552):
+Patch109: evolution-2.0.2-fix-145552.patch
+
+# Part of RH bug 170799:
+Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch
+
+# not accepted, but proposed on a few occasions. fixes problems with
+# some cyrus servers
+#Patch200: evolution-1.4.5-imap-command-length.patch
+
+# this was rejected due to adding a dependency on DISPLAY for
+# evolution-wombat but it does work to fix the problem
+#Patch500: evolution-wombat-sm.patch
+
+# This was added upstream in 1.5.93, with configure-time detection
+#Patch700: evolution-1.5.9.1-filechooser.patch
+
+# Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams):
+Patch800: evolution-2.5.4-fix-conduits.patch
+
+# Move .conduit files from share to lib (for the sake of multilib)
+Patch802: evolution-2.5.4-fix-conduit-dir.patch
+
+# Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools):
+Patch803: evolution-2.5.2-no-gnome-common.patch
+
+Patch804: evolution-2.4.1-fix-missing-declarations.patch
+Patch805: evolution-2.5.4-fix-missing-declarations.patch
+Patch806: evolution-2.5.5.1-notification-cleanups.patch
+Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
+
+Patch1000: evolution-2.5.91-check-only-active-folders.patch
+
+Summary: GNOME's next-generation groupware suite
+Group: Applications/Productivity
+
+Requires: scrollkeeper >= 0.1.4
+Requires: ORBit2 >= 2.7.5
+Requires: libsoup >= %{soup_version}
Requires: evolution-data-server >= %{eds_version}
-Requires: gspell
-Requires: highlight
-Requires: %{name}-langpacks = %{version}-%{release}
+Requires: gnome-spell >= 1.0.2
+Requires: gtk2 >= 2.4.0
+Requires: libbonoboui >= %{libbonoboui_version}
+Requires: ORBit2 >= %{orbit2_version}
+Requires: spamassassin
+Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
+Requires: redhat-menus >= %{redhat_menus_version}
+Requires: gnutls
+Requires: dbus >= %{dbus_version}
+Requires: libgnomeprint22 >= %{libgnomeprint22_version}
+Requires: gnome-vfs2 >= %{gnomevfs2_version}
-### Build Dependencies ###
-
-%if ! 0%{?flatpak}
-BuildRequires: %{_bindir}/killall
+%if %{libnotify_support}
+Requires: libnotify
%endif
-BuildRequires: cmake
-BuildRequires: gcc
-BuildRequires: gettext
-%if %{with_docs}
+
+Obsoletes: libgal2 <= %{last_libgal2_version}
+
+BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
+BuildRequires: libsoup-devel >= %{soup_version}
+BuildRequires: evolution-data-server-devel >= %{eds_version}
+BuildRequires: libbonobo-devel >= 2.0
+BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
+BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
+BuildRequires: libgnomeui-devel >= 2.0
+BuildRequires: libgnomecanvas-devel >= 2.0
+BuildRequires: libxml2-devel
+BuildRequires: GConf2-devel
+BuildRequires: intltool
+BuildRequires: ORBit2-devel >= %{orbit2_version}
+BuildRequires: atk-devel
+# kind of silly...
+BuildRequires: flex bison byacc libtool gettext
+BuildRequires: gnutls-devel
+BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: gtk-doc
+
+%if %{use_mozilla_nss}
+BuildRequires: nspr-devel
+BuildRequires: nss-devel
+%else
+BuildRequires: openssl-devel
%endif
-BuildRequires: highlight
-BuildRequires: intltool >= %{intltool_version}
-BuildRequires: itstool
+
BuildRequires: pkgconfig
-BuildRequires: yelp-tools
+BuildRequires: desktop-file-utils
+BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
-BuildRequires: pkgconfig(atk)
-BuildRequires: pkgconfig(cairo-gobject)
-BuildRequires: pkgconfig(camel-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(enchant-2)
-BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
-BuildRequires: pkgconfig(gdk-pixbuf-2.0)
-BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
-BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
-BuildRequires: pkgconfig(gnome-autoar-0) >= %{gnome_autoar_version}
-BuildRequires: pkgconfig(gnome-autoar-gtk-0) >= %{gnome_autoar_version}
-BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
-BuildRequires: pkgconfig(gsettings-desktop-schemas)
-BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
-BuildRequires: pkgconfig(gspell-1)
-BuildRequires: pkgconfig(gweather4) >= %{libgweather_version}
-BuildRequires: pkgconfig(geocode-glib-2.0) >= %{geocode_glib_version}
-BuildRequires: pkgconfig(iso-codes)
-BuildRequires: pkgconfig(libcanberra-gtk3)
-BuildRequires: pkgconfig(libcmark)
-BuildRequires: pkgconfig(libebackend-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(libebook-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(libecal-2.0) >= %{eds_version}
-BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(libedataserverui-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
-BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(nspr)
-BuildRequires: pkgconfig(nss)
-BuildRequires: pkgconfig(shared-mime-info)
-BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
-BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version}
-BuildRequires: pkgconfig(webkit2gtk-web-extension-4.1) >= %{webkit2gtk_version}
-
-%if %{tnef_support}
-BuildRequires: pkgconfig(libytnef)
+%if %{inline_audio_support}
+# audio-inline plugin requires gstreamer to build:
+BuildRequires: gstreamer08-devel
%endif
-%if %{ldap_support}
-BuildRequires: openldap-devel >= 2.0.11
+%if %{ldap_support}
+BuildRequires: openldap-devel >= 2.0.11
+%endif
+
+%if %{pilot_support}
+BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version}
+# bleah, gnome-pilot really sucks this in, but then I have to have an explicit
+# versioning for gnome-pilot when it changes less than pilot-link itself
+BuildRequires: pilot-link-devel >= %{pilot_link_version}
+Requires: gnome-pilot >= %{gnome_pilot_version}
+%endif
+
+%if %{krb5_support}
+BuildRequires: krb5-devel
+# tweak for krb5 1.2 vs 1.3
+%define krb5dir /usr/kerberos
+#define krb5dir `pwd`/krb5-fakeprefix
+%endif
+
+%if %{nm_support}
+BuildRequires: NetworkManager-glib-devel
%endif
%if %{libnotify_support}
-BuildRequires: pkgconfig(libnotify)
-%endif
-
-%if %{libpst_support}
-BuildRequires: pkgconfig(libpst)
+BuildRequires: libnotify-devel
%endif
%description
Evolution is the GNOME mailer, calendar, contact manager and
-communications tool. The components which make up Evolution
-are tightly integrated with one another and act as a seamless
+communications tool. The tools which make up Evolution will
+be tightly integrated with one another and act as a seamless
personal information-management tool.
%package devel
-Summary: Development files for building against %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig(camel-1.2) >= %{eds_version}
-Requires: pkgconfig(enchant-2)
-Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
-Requires: pkgconfig(gspell-1)
-Requires: pkgconfig(gweather4) >= %{libgweather_version}
-Requires: pkgconfig(libebackend-1.2) >= %{eds_version}
-Requires: pkgconfig(libebook-1.2) >= %{eds_version}
-Requires: pkgconfig(libecal-2.0) >= %{eds_version}
-Requires: pkgconfig(libedataserver-1.2) >= %{eds_version}
-Requires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
-Requires: pkgconfig(libxml-2.0)
+Summary: Development files for building against evolution
+Group: Development/Libraries
+Requires: %{name} = %{version}
+Requires: gtkhtml3-devel >= %{gtkhtml_version}
+Requires: libsoup-devel >= %{soup_version}
Obsoletes: libgal2-devel <= %{last_libgal2_version}
%description devel
-Development files needed for building things which link against %{name}.
-
-%if %{with_docs}
-
-%package devel-docs
-Summary: Developer documentation for Evolution
-Requires: devhelp
-Requires: %{name}-devel = %{version}-%{release}
-BuildArch: noarch
-
-%description devel-docs
-This package contains developer documentation for Evolution.
-
-%endif
-
-%package langpacks
-Summary: Translations for %{name}
-BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
-
-%description langpacks
-This package contains translations for %{name}.
-
-%if %{with_docs}
-%package help
-Summary: Help files for %{name}
-Requires: %{name} = %{version}-%{release}
-Requires: yelp
-BuildArch: noarch
-
-%description help
-This package contains user documentation for %{name}.
-%endif
-
-%package bogofilter
-Summary: Bogofilter plugin for Evolution
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: bogofilter
-
-%description bogofilter
-This package contains the plugin to filter junk mail using Bogofilter.
-
-%package spamassassin
-Summary: SpamAssassin plugin for Evolution
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: spamassassin
-
-%description spamassassin
-This package contains the plugin to filter junk mail using SpamAssassin.
-
-%if %{libpst_support}
-%package pst
-Summary: PST importer plugin for Evolution
-Requires: %{name}%{?_isa} = %{version}-%{release}
-
-%description pst
-This package contains the plugin to import Microsoft Personal Storage Table
-(PST) files used by Microsoft Outlook and Microsoft Exchange.
-%endif
-
-%if %{enable_installed_tests}
-%package tests
-Summary: Tests for the %{name} package
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: python2-behave
-Requires: python2-dogtail
-
-%description tests
-The %{name}-tests package contains tests that can be used to verify
-the functionality of the installed %{name} package.
-%endif
+Development files needed for building things which link against evolution.
%prep
-%autosetup -p1 -S gendiff -N
+%setup -q
+# these are in CVS already on the 1-4-branch
-# General patches
-# %%autopatch -p1 -m 0 -M 99
+# these are in CVS already on the gnome-2-8 branch
-# Flatpak-specific patches
-%if 0%{?flatpak}
-%autopatch -p1 -m 100 -M 199
-%endif
+# Red Hat specific patches
+#patch11 -p1 -b .rhatify
-# Remove the welcome email from Novell
-for inbox in src/mail/default/*/Inbox; do
- echo -n "" > $inbox
-done
+#patch99 -p1 -b .db3pthread
-%if 0%{?flatpak}
-mv data/org.gnome.Evolution.desktop.in.in data/org.gnome.Evolution.desktop.in.i
-cat data/org.gnome.Evolution.desktop.in.i | sed -e "s/Icon=evolution/Icon=org.gnome.Evolution/" >data/org.gnome.Evolution.desktop.in.in
-%endif
+%patch98 -p1 -b .ldaphack
+
+# patches sent upstream
+%patch100 -p0 -b .addressbook-print-with-pango
+%patch101 -p1 -b .calendar-print-with-pango
+
+%patch106 -p1 -b .commit-enter-on-calendar
+%patch107 -p1 -b .move-autosave-file
+cd widgets/table
+%patch108 -p3 -b .fix-150458
+cd ../..
+%patch109 -p1 -b .fix-164957
+
+%patch110 -p1 -b .hide-switcher-buttons-by-default
+
+#patch200 -p1 -b .commandlength
+
+#patch500 -p0 -b .wombatsm
+
+#patch700 -p1 -b .filechooser
+
+%patch800 -p1 -b .fix-conduits
+%patch802 -p1 -b .fix-conduit-dir
+%patch803 -p1 -b .no-gnome-common
+%patch804 -p1 -b .fix-missing-declarations
+%patch805 -p1 -b .fix-missing-declarations-2-5-4
+%patch806 -p1 -b .notification-cleanups
+%patch808 -p1 -b .fix-missing-declarations-2.5.5.1
+
+%patch1000 -p1 -b .checksub
+
+mkdir -p krb5-fakeprefix/include
+mkdir -p krb5-fakeprefix/lib
+mkdir -p krb5-fakeprefix/%{_lib}
%build
-
# define all of our flags, this is kind of ugly :(
%if %{ldap_support}
-%define ldap_flags -DWITH_OPENLDAP=ON
+%define ldap_flags --with-openldap=yes
%else
-%define ldap_flags -DWITH_OPENLDAP=OFF
+%define ldap_flags --without-openldap
%endif
-%define ssl_flags -DENABLE_SMIME=ON
+%if %{pilot_support}
+%define pilot_flags --enable-pilot-conduits=yes
+%else
+%define pilot_flags --enable-pilot-conduits=no
+%endif
-if ! pkg-config --exists nss; then
+%if %{krb5_support}
+%define krb5_flags --with-krb5=%{krb5dir}
+%else
+%define krb5_flags --without-krb5
+%endif
+
+%if %{nntp_support}
+%define nntp_flags --enable-nntp=yes
+%else
+%define nntp_flags --enable-nntp=no
+%endif
+
+%if %{use_mozilla_nss}
+%define ssl_flags --enable-nss=yes --enable-smime=yes
+%else
+%define ssl_flags --enable-openssl=yes
+%endif
+
+%if %{use_mozilla_nss}
+if ! pkg-config --exists nss; then
echo "Unable to find suitable version of mozilla nss to use!"
exit 1
fi
+%endif
-%if %{with_docs}
-%define gtkdoc_flags -DENABLE_GTK_DOC=ON -DWITH_HELP=ON
+%if %{exchange_support}
+%define exchange_flags --enable-exchange=yes
%else
-%define gtkdoc_flags -DENABLE_GTK_DOC=OFF -DWITH_HELP=OFF
+%define exchange_flags --enable-exchange=no
%endif
-%if %{enable_installed_tests}
-%define tests_flags -DENABLE_INSTALLED_TESTS=ON
+CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS
+%if ! %{use_mozilla_nss}
+if pkg-config openssl ; then
+ CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
+ LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
+fi
+%endif
+
+# Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths):
+aclocal
+autoheader
+automake
+libtoolize
+intltoolize --force
+autoconf
+
+# Configuration:
+%configure \
+ --enable-gtk-doc=yes \
+ --enable-ipv6 \
+ --enable-file-locking=fcntl --enable-dot-locking=no \
+ --with-sub-version=" (%{version}-%{release})" \
+ --with-kde-applnk-path=no \
+ --enable-file-chooser=yes \
+ %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \
+ --enable-plugins=all
+export tagname=CC
+
+# Do the make, with various flags:
+%if %{require_function_declarations}
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
%else
-%define tests_flags -DENABLE_INSTALLED_TESTS=OFF
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS"
%endif
-%if %{tnef_support}
-%global tnef_flags -DENABLE_YTNEF=ON
-%else
-%global tnef_flags -DENABLE_YTNEF=OFF
-%endif
-
-%if 0%{?flatpak}
-%global temp_home "-DTEMP_HOME=1"
-%else
-%global temp_home ""
-%endif
-
-CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home"
-export CFLAGS
-
-%cmake -DENABLE_MAINTAINER_MODE=OFF \
- -DVERSION_SUBSTRING=" (%{version}-%{release})" \
- %ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \
- -DENABLE_PLUGINS=all \
- %if 0%{?flatpak}
- "-DWITH_WMCLASS_OVERRIDE=evolution.bin" \
- %endif
- -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
- -DLIB_INSTALL_DIR:PATH=%{_libdir} \
- -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
- -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
- %if "%{?_lib}" == "lib64"
- -DLIB_SUFFIX=64 \
- %endif
- %{nil}
-
-%cmake_build
-
-%if %{with_docs}
-
-# Replace identical images in the help by links.
-# This reduces the RPM size by several megabytes.
-helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
-for f in $helpdir/C/figures/*.png; do
- b="$(basename $f)"
- for d in $helpdir/*; do
- if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
- g="$d/figures/$b"
- if [ -f "$g" ]; then
- if cmp -s $f $g; then
- rm "$g"; ln -s "../../C/figures/$b" "$g"
- fi
- fi
- fi
- done
-done
-
-# %%{with_docs}
-%endif
+#cat /dev/null > default_user/local/Inbox/mbox
%install
-%cmake_install
+rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+export tagname=CC
+make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%if 0%{?flatpak}
-%{S:1} <%{S:2} >flatpak-evolution-wrapper.sh
-chmod a+x flatpak-evolution-wrapper.sh
-mv $RPM_BUILD_ROOT%{_bindir}/evolution $RPM_BUILD_ROOT%{_bindir}/evolution.bin
-cp flatpak-evolution-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/evolution
+# remove libtool archives for importers and the like
+find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
+
+# remove statically built libraries:
+find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
+
+# pilot conduits static and libtool bits should go away too
+rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la
+
+# remove additional things we don't want
+%if ! %{inline_audio_support}
+%{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \
+ $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so
%endif
-%find_lang evolution --all-name --with-gnome
+# scrollkeeper gets handled in %post
+rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-grep "%{_datadir}/locale" evolution.lang > translations.lang
-%if %{with_docs}
-grep -v "%{_datadir}/locale" evolution.lang > help.lang
-%endif
+# evolution is the preferred email app
+ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
+ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
+ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
+ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/
-%ldconfig_scriptlets
+# remove upstream desktop file; use the symlinks from above (#103826)
+rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop
-%files
-%license COPYING
-%doc AUTHORS NEWS README.md
-%{_mandir}/man1/*
+# evolution link
+ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
-# GSettings schemas:
-%{_datadir}/GConf/gsettings/evolution.convert
+for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
+ sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
+done
+%find_lang %name-%{evo_major}
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.sender-validator.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
+%post
+/sbin/ldconfig
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas"
+for S in $SCHEMAS; do
+ gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
+done
+scrollkeeper-update
-# The main executable
+%postun
+/sbin/ldconfig
+scrollkeeper-update
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}-%{evo_major}.lang
+%defattr(-, root, root)
+%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+# GConf schemas:
+%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas
+%{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas
+
+# The main executable and a symlink:
+%{_bindir}/evolution-%{evo_major}
%{_bindir}/evolution
-%if 0%{?flatpak}
-%{_bindir}/evolution.bin
-%endif
-
-%{_datadir}/metainfo/org.gnome.Evolution.metainfo.xml
-
# Desktop files:
-%{_datadir}/applications/org.gnome.Evolution.desktop
+%{_datadir}/applications/redhat-evolution-mail.desktop
+%{_datadir}/applications/redhat-evolution-calendar.desktop
+%{_datadir}/applications/redhat-evolution-contacts.desktop
+%{_datadir}/applications/redhat-evolution-tasks.desktop
-# Icons:
-%{_datadir}/icons/hicolor/16x16/apps/*
-%{_datadir}/icons/hicolor/22x22/apps/*
-%{_datadir}/icons/hicolor/24x24/apps/*
-%{_datadir}/icons/hicolor/32x32/apps/*
-%{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/scalable/apps/*
+# Online help:
+%{_datadir}/gnome/help/evolution-%{evo_major}
+%{_datadir}/omf/evolution
+
+# IDL files (should this be in devel subpackage?)
+%{_datadir}/idl/evolution-%{evo_major}
+
+# mime-info data:
+%{_datadir}/mime-info/evolution-%{evo_major}.keys
+%{_datadir}/mime-info/evolution-%{evo_major}.mime
# The main data directory
# (have not attempted to split this up into an explicit list)
%dir %{_datadir}/evolution
-%{_datadir}/evolution
+%{_datadir}/evolution/%{evo_major}
-# Modules:
+%{_datadir}/pixmaps/evolution-%{evo_major}.png
+
+# Bonobo components:
+%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Mail_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Shell_%{evo_major}.server
%dir %{_libdir}/evolution
-%dir %{_libdir}/evolution/modules
-%{_libdir}/evolution/modules/module-accounts-window.so
-%{_libdir}/evolution/modules/module-addressbook.so
-%{_libdir}/evolution/modules/module-appearance-settings.so
-%{_libdir}/evolution/modules/module-backup-restore.so
-%{_libdir}/evolution/modules/module-book-config-carddav.so
-%{_libdir}/evolution/modules/module-book-config-google.so
-%{_libdir}/evolution/modules/module-book-config-ldap.so
-%{_libdir}/evolution/modules/module-book-config-local.so
-%{_libdir}/evolution/modules/module-cal-config-caldav.so
-%{_libdir}/evolution/modules/module-cal-config-contacts.so
-%{_libdir}/evolution/modules/module-cal-config-google.so
-%{_libdir}/evolution/modules/module-cal-config-local.so
-%{_libdir}/evolution/modules/module-cal-config-weather.so
-%{_libdir}/evolution/modules/module-cal-config-webcal.so
-%{_libdir}/evolution/modules/module-cal-config-webdav-notes.so
-%{_libdir}/evolution/modules/module-calendar.so
-%{_libdir}/evolution/modules/module-composer-autosave.so
-%{_libdir}/evolution/modules/module-composer-to-meeting.so
-%{_libdir}/evolution/modules/module-config-lookup.so
-%{_libdir}/evolution/modules/module-contact-photos.so
-%{_libdir}/evolution/modules/module-gravatar.so
-%{_libdir}/evolution/modules/module-itip-formatter.so
-%{_libdir}/evolution/modules/module-mail-config.so
-%{_libdir}/evolution/modules/module-mail.so
-%{_libdir}/evolution/modules/module-mailto-handler.so
-%{_libdir}/evolution/modules/module-mdn.so
-%{_libdir}/evolution/modules/module-offline-alert.so
-%{_libdir}/evolution/modules/module-prefer-plain.so
-%{_libdir}/evolution/modules/module-plugin-lib.so
-%{_libdir}/evolution/modules/module-plugin-manager.so
-%{_libdir}/evolution/modules/module-rss.so
-%{_libdir}/evolution/modules/module-settings.so
-%{_libdir}/evolution/modules/module-startup-wizard.so
-%{_libdir}/evolution/modules/module-text-highlight.so
-%{_libdir}/evolution/modules/module-vcard-inline.so
-%{_libdir}/evolution/modules/module-webkit-editor.so
-%{_libdir}/evolution/modules/module-webkit-inspector.so
-
-%if %{tnef_support}
-%{_libdir}/evolution/modules/module-tnef-attachment.so
-%endif
-
-%{_libdir}/evolution-data-server/camel-providers/libcamelrss.so
-%{_libdir}/evolution-data-server/camel-providers/libcamelrss.urls
-%{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
+%dir %{_libdir}/evolution/%{evo_major}
+%dir %{_libdir}/evolution/%{evo_major}/components
+%{_libdir}/evolution/%{evo_major}/components/libevolution-addressbook.so
+%{_libdir}/evolution/%{evo_major}/components/libevolution-calendar.so
+%{_libdir}/evolution/%{evo_major}/components/libevolution-mail.so
# Shared libraries:
-%{_libdir}/evolution/libevolution-mail-composer.so
-%{_libdir}/evolution/libeabutil.so
-%{_libdir}/evolution/libeabwidgets.so
-%{_libdir}/evolution/libecontacteditor.so
-%{_libdir}/evolution/libecontactlisteditor.so
-%{_libdir}/evolution/libecontactprint.so
-%{_libdir}/evolution/libemail-engine.so
-%{_libdir}/evolution/libevcardeditor.so
-%{_libdir}/evolution/libevolution-mail-formatter.so
-%{_libdir}/evolution/libevolution-shell.so
-%{_libdir}/evolution/libessmime.so
-%{_libdir}/evolution/libevolution-util.so
-%{_libdir}/evolution/libevolution-addressbook-importers.so
-%{_libdir}/evolution/libevolution-calendar.so
-%{_libdir}/evolution/libevolution-calendar-importers.so
-%{_libdir}/evolution/libevolution-mail-importers.so
-%{_libdir}/evolution/libevolution-mail.so
-%{_libdir}/evolution/libevolution-rss-common.so
-%{_libdir}/evolution/libevolution-smime.so
-%{_libdir}/evolution/libgnomecanvas.so
-
-# WebKit2 Extensions
-%{_libdir}/evolution/web-extensions/libewebextension.so
-%{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
+%{_libdir}/evolution/%{evo_major}/libeabutil.so.*
+%{_libdir}/evolution/%{evo_major}/libeconduit.so.*
+%{_libdir}/evolution/%{evo_major}/libecontacteditor.so.*
+%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.*
+%{_libdir}/evolution/%{evo_major}/libefilterbar.so.*
+%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so.*
+%{_libdir}/evolution/%{evo_major}/libeshell.so.*
+%{_libdir}/evolution/%{evo_major}/libessmime.so.*
+%{_libdir}/evolution/%{evo_major}/libetable.so.*
+%{_libdir}/evolution/%{evo_major}/libetext.so.*
+%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so.*
+%{_libdir}/evolution/%{evo_major}/libeutil.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-smime.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.*
+%{_libdir}/evolution/%{evo_major}/libfilter.so.*
+%{_libdir}/evolution/%{evo_major}/libmenus.so.*
# Various libexec programs:
%dir %{_libexecdir}/evolution
-%{_libexecdir}/evolution/evolution-backup
-%{_libexecdir}/evolution/killev
+%dir %{_libexecdir}/evolution/%{evo_major}
+%{_libexecdir}/evolution/%{evo_major}/csv2vcard
+%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
+%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
+%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
+%{_libexecdir}/evolution/%{evo_major}/killev
+
+# Various conduits for gnome-pilot:
+%if %{pilot_support}
+%dir %{_libdir}/evolution/%{evo_major}/conduits
+
+%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-address-%{evo_major}.conduit
+
+%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-calendar-%{evo_major}.conduit
+
+%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-memo-%{evo_major}.conduit
+
+%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-todo-%{evo_major}.conduit
+%endif
# The plugin directory:
%dir %{evo_plugin_dir}
# The various plugins follow; they are all part of the main package:
-# (note that there are various resources such as ui and pixmap files that
-# are built as part of specific plugins but which are currently packaged using
+# (note that there are various resources such as glade and pixmap files that
+# are built as part of specific plugins but which are currently packaged using
# globs above; the purpose of the separation below is to be more explicit about
# which plugins we ship)
-%{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so
+%{evo_plugin_dir}/org-gnome-mail-account-disable.eplug
+%{evo_plugin_dir}/libmail-account-disable.so
-%{evo_plugin_dir}/org-gnome-email-custom-header.eplug
-%{evo_plugin_dir}/liborg-gnome-email-custom-header.so
+%{evo_plugin_dir}/org-gnome-addressbook-file.eplug
+%{evo_plugin_dir}/liborg-gnome-addressbook-file.so
+
+%if %{inline_audio_support}
+%{evo_plugin_dir}/org-gnome-audio-inline.eplug
+%{evo_plugin_dir}/liborg-gnome-audio-inline.so
+%endif
+
+%{evo_plugin_dir}/org-gnome-calendar-file.eplug
+%{evo_plugin_dir}/liborg-gnome-calendar-file.so
+
+%{evo_plugin_dir}/org-gnome-calendar-http.eplug
+%{evo_plugin_dir}/liborg-gnome-calendar-http.so
+
+%{evo_plugin_dir}/org-gnome-calendar-weather.eplug
+%{evo_plugin_dir}/liborg-gnome-calendar-weather.so
+
+%{evo_plugin_dir}/org-gnome-copy-tool.eplug
+%{evo_plugin_dir}/liborg-gnome-copy-tool.so
+
+%{evo_plugin_dir}/org-gnome-default-mailer.eplug
+%{evo_plugin_dir}/liborg-gnome-default-mailer.so
+
+%{evo_plugin_dir}/org-gnome-default-source.eplug
+%{evo_plugin_dir}/liborg-gnome-default-source.so
%{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
%{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
-%{evo_plugin_dir}/org-gnome-external-editor.eplug
-%{evo_plugin_dir}/liborg-gnome-external-editor.so
+%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so
-%{evo_plugin_dir}/org-gnome-face.eplug
-%{evo_plugin_dir}/liborg-gnome-face.so
+%{evo_plugin_dir}/org-gnome-exchange-operations.eplug
+%{evo_plugin_dir}/liborg-gnome-exchange-operations.so
+%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml
+%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml
+%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml
+%{evo_plugin_dir}/org-gnome-folder-permissions.xml
+%{evo_plugin_dir}/org-gnome-folder-subscription.xml
+
+%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
+%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
+%{evo_plugin_dir}/org-gnome-compose-send-options.xml
+
+%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
+%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
+
+%{evo_plugin_dir}/org-gnome-itip-formatter.eplug
+%{evo_plugin_dir}/liborg-gnome-itip-formatter.so
%{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug
%{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so
-
-%{evo_plugin_dir}/org-gnome-mail-notification.eplug
-%{evo_plugin_dir}/liborg-gnome-mail-notification.so
+%{evo_plugin_dir}/org-gnome-mailing-list-actions.xml
%{evo_plugin_dir}/org-gnome-mail-to-task.eplug
%{evo_plugin_dir}/liborg-gnome-mail-to-task.so
+%{evo_plugin_dir}/org-gnome-mail-to-task.xml
-%{evo_plugin_dir}/org-gnome-prefer-plain.eplug
-%{evo_plugin_dir}/liborg-gnome-prefer-plain.so
+%{evo_plugin_dir}/org-gnome-mark-all-read.eplug
+%{evo_plugin_dir}/liborg-gnome-mark-all-read.so
-%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
-%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
+%{evo_plugin_dir}/org-gnome-mark-calendar-offline.eplug
+%{evo_plugin_dir}/liborg-gnome-mark-calendar-offline.so
+
+%{evo_plugin_dir}/org-gnome-new-mail-notify.eplug
+%{evo_plugin_dir}/liborg-gnome-new-mail-notify.so
+
+%{evo_plugin_dir}/org-gnome-plugin-manager.eplug
+%{evo_plugin_dir}/liborg-gnome-plugin-manager.so
+%{evo_plugin_dir}/org-gnome-plugin-manager.xml
+
+%{evo_plugin_dir}/org-gnome-print-message.eplug
+%{evo_plugin_dir}/liborg-gnome-print-message.so
+%{evo_plugin_dir}/org-gnome-print-message.xml
+
+%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug
+%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
%{evo_plugin_dir}/org-gnome-save-calendar.eplug
%{evo_plugin_dir}/liborg-gnome-save-calendar.so
-%{evo_plugin_dir}/org-gnome-evolution-sender-validation.eplug
-%{evo_plugin_dir}/liborg-gnome-evolution-sender-validation.so
+%{evo_plugin_dir}/org-gnome-select-one-source.eplug
+%{evo_plugin_dir}/liborg-gnome-select-one-source.so
-%{evo_plugin_dir}/org-gnome-templates.eplug
-%{evo_plugin_dir}/liborg-gnome-templates.so
+%{evo_plugin_dir}/org-gnome-subject-thread.eplug
+%{evo_plugin_dir}/liborg-gnome-subject-thread.so
-%{evo_plugin_dir}/org-gnome-dbx-import.eplug
-%{evo_plugin_dir}/liborg-gnome-dbx-import.so
+%{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so
+%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
+%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
+%{evo_plugin_dir}/org-gnome-publish-calendar.xml
+%{evo_plugin_dir}/publish-calendar.glade
+
+%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
+
+%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so
%files devel
-%{_includedir}/evolution
-%{_libdir}/pkgconfig/evolution-calendar-3.0.pc
-%{_libdir}/pkgconfig/evolution-mail-3.0.pc
-%{_libdir}/pkgconfig/evolution-shell-3.0.pc
-%{_libdir}/pkgconfig/libemail-engine.pc
-
-%if %{with_docs}
-
-%files devel-docs
-%doc %{_datadir}/gtk-doc/html/evolution-mail-composer
-%doc %{_datadir}/gtk-doc/html/evolution-mail-engine
-%doc %{_datadir}/gtk-doc/html/evolution-mail-formatter
-%doc %{_datadir}/gtk-doc/html/evolution-shell
-%doc %{_datadir}/gtk-doc/html/evolution-util
-
-%endif
-
-%files langpacks -f translations.lang
-
-%if %{with_docs}
-%files help -f help.lang
-%endif
-
-%files bogofilter
-%{_libdir}/evolution/modules/module-bogofilter.so
-%{_datadir}/metainfo/org.gnome.Evolution-bogofilter.metainfo.xml
-
-%files spamassassin
-%{_libdir}/evolution/modules/module-spamassassin.so
-%{_datadir}/metainfo/org.gnome.Evolution-spamassassin.metainfo.xml
-
-%if %{libpst_support}
-%files pst
-%{_datadir}/metainfo/org.gnome.Evolution-pst.metainfo.xml
-%{evo_plugin_dir}/org-gnome-pst-import.eplug
-%{evo_plugin_dir}/liborg-gnome-pst-import.so
-%endif
-
-%if %{enable_installed_tests}
-%files tests
-%{_libexecdir}/%{name}/installed-tests
-%{_datadir}/installed-tests
-%endif
+%defattr(-, root, root)
+%{_includedir}/evolution-%{evo_major}
+%{_libdir}/pkgconfig/evolution-plugin-%{evo_major}.pc
+%{_libdir}/pkgconfig/evolution-shell-%{evo_major}.pc
+%{_libdir}/evolution/%{evo_major}/libeabutil.so
+%{_libdir}/evolution/%{evo_major}/libeconduit.so
+%{_libdir}/evolution/%{evo_major}/libecontacteditor.so
+%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so
+%{_libdir}/evolution/%{evo_major}/libefilterbar.so
+%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so
+%{_libdir}/evolution/%{evo_major}/libeshell.so
+%{_libdir}/evolution/%{evo_major}/libessmime.so
+%{_libdir}/evolution/%{evo_major}/libetable.so
+%{_libdir}/evolution/%{evo_major}/libetext.so
+%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so
+%{_libdir}/evolution/%{evo_major}/libeutil.so
+%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so
+%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so
+%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so
+%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so
+%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so
+%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
+%{_libdir}/evolution/%{evo_major}/libevolution-smime.so
+%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so
+%{_libdir}/evolution/%{evo_major}/libfilter.so
+%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
-%autochangelog
+* Tue Feb 14 2006 David Malcolm - 2.5.91-1
+- 2.5.91
+- updated patch 101 to track upstream changes to calendar printing code
+- remove uptreamed patch 807 (NM multiple initialization assertion)
+- readded the mail-to-task plugin XML UI file
+- bump e-d-s req to 1.5.91
+
+* Fri Feb 10 2006 Jesse Keating - 2.5.90-2.1
+- bump again for double-long bug on ppc(64)
+
+* Thu Feb 9 2006 Christopher Aillon - 2.5.90-2
+- Disable the inline audio plugin for now since it uses gstreamer08
+
+* Tue Feb 07 2006 Jesse Keating - 2.5.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 30 2006 David Malcolm - 2.5.90-1
+- 2.5.90
+- trimmed patches 805 and 808, as parts of these got merged upstream
+- trimmed and regenerated patch 806 to track upstream
+- removed the mail-to-task plugin XML UI file
+
+* Sat Jan 28 2006 David Malcolm - 2.5.5.1-2
+- added missing patch
+
+* Wed Jan 25 2006 David Malcolm - 2.5.5.1-1
+- 2.5.5.1
+- update patch 106 to track upstream, renaming from
+ evolution-2.2.2-commit-enter-on-calendar.patch to
+ evolution-2.5.5.1-commit-enter-on-calendar.patch
+- update patch 805 to track upstream
+- added patch to fix some newly missing declarations (patch 808)
+- replace evolution-2.5.4-port-to-new-libnotify-api.patch with
+ evolution-2.5.5.1-notification-cleanups.patch, since much of this was
+ duplicated by another patch that landed upstream; removing the actions code
+ as it was crashing deep inside DBus (patch 806, #177666)
+- explicitly list various files to reduce reliance on globbing; organized the
+ files into logical groups; comment them
+- added -Wno-sign-compare to CFLAGS
+- enabled parallel make
+- introduced require_function_declarations macro to make
+ -Werror-implicit-function-declaration flag optional; turn it off for now
+- include the new CalDAV and mail-attachments-import plugins in the file list;
+ add an XML UI file for the mail-to-task plugin.
+- use "sed -i -e" rather than "sed -ie" to avoid getting severe bonobo files
+
+* Wed Jan 18 2006 Ray Strode - 2.5.4-10
+- fix fix for multilib issue with shlib bonobo components (bug 156982)
+
+* Wed Jan 18 2006 Ray Strode - 2.5.4-9
+- fix multilib issue with shlib bonobo components (bug 156982)
+
+* Thu Jan 12 2006 David Malcolm - 2.5.4-8
+- avoid multiple initialization of NetworkManager connections (patch 807,
+ gnome bug #326785)
+
+* Thu Jan 12 2006 David Malcolm - 2.5.4-7
+- updated alarm notification patch(patch 806, #177546, #177666, #177667,
+ #177670)
+
+* Thu Jan 12 2006 Christopher Aillon - 2.5.4-6
+- Remove unneeded Requires: notify-daemon
+
+* Thu Jan 12 2006 Christopher Aillon - 2.5.4-5
+- Update BR to libnotify-devel
+
+* Wed Jan 11 2006 David Malcolm - 2.5.4-4
+- ported alarm notification code to the new libnotify API (patch 806, #177546)
+- added libnotify_support macro
+- added explicit notify-daemon requirement as a workaround for bug #177535
+
+* Tue Jan 10 2006 David Malcolm - 2.5.4-3
+- updated patch 800 to include patch for memo conduit (untested at this stage);
+ renaming from evolution-2.5.2-fix-conduits.patch to
+ evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo
+ conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to
+ evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160)
+- switch the build-time dep for the audio-inline plugin from gstreamer-devel to
+ gstreamer08-devel to better reflect the test in the tarball's configure.in
+
+* Wed Jan 4 2006 David Malcolm - 2.5.4-2
+- added optional build-time requirement on NetworkManager-glib-devel
+- update patch 805 to cover a missing declaration in Network Manager support
+
+* Tue Jan 3 2006 David Malcolm - 2.5.4-1
+- 2.5.4
+- update patch 107 to track underlying code changes; rename from
+ evolution-2.2.2-move-autosave-file.patch to
+ evolution-2.5.4-move-autosave-file.patch
+- added patch to fix more missing declarations (patch 805)
+- added files for publish-calendar plugin
+
+* Mon Dec 19 2005 David Malcolm - 2.5.3-1
+- 2.5.3
+- Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it
+ still applies cleanly
+
+* Thu Dec 15 2005 Christopher Aillon 2.5.2-2
+- Require nspr and nss instead of mozilla-nspr and mozilla-nss
+- Update no-gnome-common patch to work with standalone nss package
+
+* Fri Dec 09 2005 Jesse Keating
+- rebuilt
+
+* Wed Dec 7 2005 David Malcolm - 2.5.2-1
+- 2.5.2
+- bump gtkhtml requirement from 3.7.6 to 3.9.2
+- bump eds requirement from 1.4.1.1 to 1.5.2
+- bump evo_major from 2.4 to 2.6
+- updated patch 107
+- updated patch 108
+- updated patch 800, replacing
+ rh-161817-attach-116019-conduit_pilot_link_updates.diff with
+ evolution-2.5.2-fix-conduits.patch. Not yet complete.
+- disable pilot support for now (see #175160)
+- added hula plugin to list of packaged plugins
+- generalize gconf schema packaging to support changing evo_major
+
+* Fri Dec 2 2005 David Malcolm - 2.4.2-2
+- force regeneration of the intltool files to prevent a problem where the
+ tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the
+ latest shipped copy of intltool, which resulted in a broken intltool-merge
+ script when the tree was reautotooled. (appears that the tarball was built
+ with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to
+ @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that
+ change)
+
+* Tue Nov 29 2005 David Malcolm - 2.4.2-1
+- 2.4.2
+- explicitly list the plugins that are packaged (#166234)
+- added build-time requirement on gstreamer-devel to cope with audio-inline
+ plugin
+
+* Tue Nov 29 2005 David Malcolm - 2.4.1-8
+- add -DLDAP_DEPRECATED to CFLAGS (#172999)
+
+* Wed Oct 26 2005 David Malcolm - 2.4.1-7
+- Added a patch (110) to hide the component switcher buttons by default on new
+ windows (#170799) by patching the GConf schema.
+- Made list of installed schemas explicit.
+- Own the plugins subdirectory
+
+* Tue Oct 25 2005 David Malcolm - 2.4.1-6
+- use 4 separate .desktop files from the redhat-menus package, rather than the
+ current single one; bump the redhat-menus requirement accordingly (from 1.13
+ to 5.0.4); introduce a macro for this requirement.
+
+* Mon Oct 24 2005 David Malcolm - 2.4.1-5
+- fix removal of upstream .desktop file (broke on upgrade to Evolution 2.2, and
+ continued to be broken with 2.3/2.4) (#103826, again)
+
+* Tue Oct 18 2005 David Malcolm - 2.4.1-4
+- updated patch 804 to declare e_calendar_table_process_completed_tasks
+
+* Tue Oct 18 2005 David Malcolm - 2.4.1-3
+- added patch (804: evolution-2.4.1-fix-missing-declarations.patch) to fix
+ missing declaration (thanks to Peter Robinson)
+
+* Mon Oct 17 2005 David Malcolm - 2.4.1-2
+- bump e-d-s requirement to 1.4.1.1
+
+* Tue Oct 4 2005 David Malcolm - 2.4.1-1
+- 2.4.1
+- regenerate patch 101 to handle conflict in
+ calendar/gui.print.c: print_week_day_event introduced by fix to upstream bug
+ 244981 (end date added while printing in the week view); bump patch name from
+ version 5 to version 6
+- removed patch 804 (conduits-multi-day-crash); this is now in upstream tarball
+
+* Wed Sep 14 2005 Jeremy Katz - 2.4.0-2
+- rebuild for mozilla on ppc64
+
+* Wed Sep 7 2005 David Malcolm - 2.4.0-1
+- 2.4.0
+- Removed patch to fix implicit function declarations (patch 110, added in
+ 2.3.8-1) as this is now upstream.
+
+* Thu Sep 1 2005 David Malcolm - 2.3.8-4
+- Enable exchange support when configuring, so that the exchange-operations
+ plugin gets built.
+
+* Fri Aug 26 2005 David Malcolm - 2.3.8-3
+- Added patch for #157074 (patch 804)
+
+* Fri Aug 26 2005 David Malcolm - 2.3.8-2
+- Move -Werror-implicit-function-declaration from configuration to the make
+ stage, to avoid breaking configuration tests.
+
+* Tue Aug 23 2005 David Malcolm - 2.3.8-1
+- 2.3.8
+- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the
+ problems arising (patch 110)
+
+* Tue Aug 16 2005 David Malcolm - 2.3.7-3
+- Introduce macro for gnome-pilot dependency, bumping from 2.0.6 to 2.0.13
+- Add obsoletion of libgal2/libgal2-devel (dependency was removed in 2.3.6-1);
+ based on the last EVR of the libgal2 package in CVS, 2:2.5.3-2
+
+* Mon Aug 15 2005 David Malcolm - 2.3.7-2
+- rebuild
+
+* Tue Aug 9 2005 David Malcolm - 2.3.7-1
+- 2.3.7
+- Bump evolution-data-server requirement from 1.3.6 to 1.3.7
+- Bump gtkhtml3 requirement from 3.6.2 to 3.7.6
+
+* Mon Aug 8 2005 Tomas Mraz - 2.3.6.1-5
+- rebuild with new gnutls
+
+* Tue Aug 2 2005 David Malcolm - 2.3.6.1-4
+- Added patch to show correct mimetype for OpenOffice.org files when guessing
+ type for attachments with mimetype "application/octet-stream" (#164957)
+
+* Mon Aug 1 2005 David Malcolm - 2.3.6.1-3
+- Improved version of evolution-2.3.5.1-fix-150458.patch (#150458)
+
+* Sat Jul 30 2005 David Malcolm 2.3.6.1-2
+- Fixed version numbers in GConf schema files (#164622); added
+ apps-evolution-mail-prompts-checkdefault-2.4.schemas
+
+* Fri Jul 29 2005 David Malcolm - 2.3.6.1-1
+- 2.3.6.1
+
+* Thu Jul 28 2005 David Malcolm - 2.3.6-1
+- 2.3.6
+- Bump evolution-data-server requirement to 1.3.6 (needed for
+ CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
+- Removed libgal2[-devel] dependencies; the code has been moved into the
+ evolution tarball
+
+* Thu Jul 28 2005 David Malcolm - 2.3.5.1-2
+- added experimental patch to port ETable printing to use Pango (#150458)
+
+* Mon Jul 25 2005 David Malcolm - 2.3.5.1-1
+- 2.3.5.1
+- Update evo_major from 2.2 to 2.4
+- Updated evo-calendar-print-with-pango- patch from version 4 to 5
+- Removed Patch105: evolution-2.2.2-fix-new-mail-notify.patch as configure.in
+ in this branch tests for existance for dbus-glib-1, rather than max-version.
+- Removed Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch as
+ this is now in upstream tarball.
+- Removed evolution-calendar-importers and evolution-addressbook-importers
+ directories.
+- Updated evolution-2.2.2-no-gnome-common.patch to include a patch to rename
+ mozilla-nspr to nspr
+
+* Tue Jun 28 2005 David Malcolm - 2.2.2-11.fc5
+- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803)
+
+* Tue Jun 28 2005 David Malcolm - 2.2.2-10.fc5
+- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802)
+
+* Mon Jun 27 2005 David Malcolm - 2.2.2-9.fc5
+- Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817)
+- Added Mark G Adams's memory leak fix (patch 801)
+
+* Mon Jun 6 2005 David Malcolm - 2.2.2-8
+- Added Ivan Gyurdiev's patch to move autosave files inside the .evolution
+ directory
+
+* Thu May 26 2005 David Malcolm - 2.2.2-7
+- Added Akira Tagoh's patch for calendar keypress handling (#154360)
+
+* Mon May 23 2005 David Malcolm - 2.2.2-6
+- Remove static versions of libraries
+
+* Thu May 5 2005 David Malcolm - 2.2.2-5
+- added evolution-2.2.2-fix-new-mail-notify.patch to CVS
+
+* Thu May 5 2005 David Malcolm - 2.2.2-4
+- Removed explicit mozilla_build_version; instead use pkg-config to determine
+the path to the NSS/NSPR headers.
+- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12;
+patches depend on this)
+- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus
+versions is in the upstream tarball; but configure.in disables the plugin for
+dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions,
+and run autoconf at the start of the build) (#156328)
+
+* Sat Apr 30 2005 David Malcolm - 2.2.2-3
+- updated mozilla_build_version to 1.7.7
+
+* Sat Apr 30 2005 David Malcolm - 2.2.2-2
+- Finished porting conduits to pilot-link-0.12 API; re-enabled pilot support (#152172)
+
+* Mon Apr 11 2005 David Malcolm - 2.2.2-1
+- 2.2.2
+- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item
+- removed patch for XB73912; now in upstream tarball
+- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream
+- removed patch for XB73844; now in upstream tarball
+- Update requirements:
+ - gtkhtml3 from 3.6.1 to 3.6.2
+ - libgal2 from 2.4.1 to 2.4.2
+ - eds from 1.2.1 to 1.2.2
+
+* Wed Mar 23 2005 David Malcolm - 2.2.1.1-2
+- Add patch for upstream bug XB73844 (should now be able to accept meeting requests)
+
+* Fri Mar 18 2005 David Malcolm - 2.2.1.1-1
+- 2.1.1.1
+
+* Thu Mar 17 2005 David Malcolm - 2.2.1-1
+- 2.2.1
+- Updated requirements:
+ * gtkhtml3 from 3.6.0 to 3.6.1
+ * libgal2 from 2.4.0 to 2.4.1
+ * eds from 1.2.0 to 1.2.1
+- Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4
+- The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change)
+
+* Mon Mar 14 2005 David Malcolm - 2.2.0-10
+- disabled pilot-link support for now so that we have an evolution package; more patching is needed to get this to work with pilot-link-0.12
+
+* Mon Mar 14 2005 David Malcolm - 2.2.0-9
+- another attempt at porting to pilot-link 0.12
+
+* Mon Mar 14 2005 David Malcolm - 2.2.0-8
+- Added patch to deal with changes to pilot-link from 0.11->0.12
+
+* Mon Mar 14 2005 David Malcolm - 2.2.0-7
+- use 0.31 rather than 0.31.0 for DBus version
+
+* Mon Mar 14 2005 David Malcolm - 2.2.0-6
+- rebuilt against pilot-link-0.12
+- added versioning to the requirement on dbus (>=0.31)
+
+* Thu Mar 10 2005 David Malcolm - 2.2.0-5
+- Added patch for changes to DBus API in version 0.31 (#150671)
+- Removed explicit run-time spec-file requirement on mozilla.
+ The Mozilla NSS API/ABI stabilised by version 1.7.3
+ The libraries are always located in the libdir
+ However, the headers are in /usr/include/mozilla-%{mozilla_build_version}
+ and so they move each time the mozilla version changes.
+ So we no longer have an explicit mozilla run-time requirement in the specfile;
+ a requirement on the appropriate NSS and NSPR .so files is automagically generated on build.
+ We have an explicit, exact build-time version, so that we can find the headers (without
+ invoking an RPM query from the spec file; to do so is considered bad practice)
+- Introduced mozilla_build_version, to replace mozilla_version
+
+* Wed Mar 9 2005 Christopher Aillon - 2.2.0-4
+- Depend on mozilla 1.7.6
+
+* Wed Mar 9 2005 David Malcolm - 2.2.0-3
+- added patch from upstream for bug XB-73192, fixing missing "Mark as Read/Unread" context menu items
+
+* Tue Mar 8 2005 David Malcolm - 2.2.0-2
+- actually add source tarball this time
+
+* Tue Mar 8 2005 David Malcolm - 2.2.0-1
+- 2.2.0
+- Removed patch for GCC 4 fix as this is now in upstream tarball
+- Updated requirements:
+ * gtkhtml3 from 3.5.7 to 3.6.0
+ * libgal2 from 2.3.5 to 2.4.0
+ * eds from 1.1.6 to 1.2.0
+
+* Tue Mar 8 2005 David Malcolm - 2.1.6-3
+- rebuild (to use latest DBus library)
+
+* Tue Mar 1 2005 David Malcolm - 2.1.6-2
+- added patch to fix build with GCC4
+
+* Tue Mar 1 2005 David Malcolm - 2.1.6-1
+- Update from upstream unstable 2.1.6 to 2.1.6
+- Added patches to fix calendar and addressbook printing for non-Roman scripts (#138075)
+- Added explicit requirement on libgnomeprint22 >= 2.8.0
+- Added BuildRequires: gtk-doc
+- Updated requirements:
+ * gtkhtml3 from 3.5.6 to 3.5.7
+ * libgal2 from 2.3.4 to 2.3.5
+ * eds from 1.1.5 to 1.1.6
+
+* Wed Feb 9 2005 David Malcolm - 2.1.5-1
+- Update from upstream unstable 2.1.4 to 2.1.5
+- Updated requirements:
+ * gtkhtml3 from 3.5.4 to 3.5.6
+ * libgal2 from 2.3.3 to 2.3.4
+ * eds from 1.1.4.1 to 1.1.5
+- Removed explicit packaging of weather icons as these are now below DATADIR/evolution/2.2 rather than DATADIR/evolution-2.2
+
+* Wed Jan 26 2005 David Malcolm - 2.1.4-1
+- Update from upstream stable 2.0.3 to unstable 2.1.4
+- Updated evo_major from 2.0 to 2.2
+- Removed camel packaging as this has been moved to evolution-data-server for Evolution 2.2
+- Added plugins to the packaged files
+- Added weather icons to the packaged files
+- Updated requirements:
+ * gtkhtml3 from 3.3.2 to 3.5.4
+ * libgal2 from 2.2.4 to 2.3.3
+ * eds from 1.0.3 to 1.1.4.1
+ * libsoup from 2.2.0 to 2.2.2
+- Added built-time requirement on atk-devel
+- Enable all plugins for now
+- Added requirement on dbus (for the new-mail-notify plugin)
+- Enable gtk-doc
+- Updated GConf schema name suffixes from 2.0 to 2.2
+
+* Sun Dec 19 2004 Christopher Aillon 2.0.3-2
+- Rebuild against mozilla 1.7.5
+
+* Wed Dec 15 2004 David Malcolm - 2.0.3-1
+- Update from upstream 2.0.2 to 2.0.3 with these bug fixes:
+ * Addressbook
+ XB67656 - almost the same email address are considrered identical (Siva)
+ XB69079 - Data repeated after save with bad date format (Siva)
+ XB66854 - Some strings are missed to translation (Rodney)
+
+ * Calendar
+ XB47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney)
+ XB68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP)
+ XB67403 - wrong alarm time displayed (Rodrigo)
+ XB68077 - appointment dialog re-size (Rodrigo)
+ - leak fixes (Chen)
+ - sensitize menu items in list view properly (JP)
+ - redraw display when 24hr time setting changes (JP)
+
+ * Mail
+ XB69533 - Unable to subscribe to the alt hierarchy (Michael)
+ XB69776 - Signed Mail with attachments displays everything with multipart/boundaries stuff (Michael)
+ XB69615 - delete certificate after viewing smime message (Michael)
+ XB69109 - EHLO or HELO with ip addresses does not conform rfc 821 (Michael)
+ XB69982 - During Newsgroup list refresh, it crashes (Michael)
+ XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur)
+ XB68556 - NNTP with SSL won't work, even with stunnel (Michael)
+ XB69145 - toplevel message/rfc822 parts are broken for IMAP (Michael)
+ XB69241 - base64 attachement holding PGP block (Jeff)
+ XB67895 - nntp support not asking for password (Michael)
+ XB67898 - Use of symbolic port-names is not guaranteed to work everywhere (Michael)
+ XB69851 - remember password check doesn't stick (Michael)
+ XB69623 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek)
+ XB69339 - postscript and some other attachments not visable (Michael)
+ XB69579 - vFoldersXBUNMATCHED generates errors (Michael)
+ XB68958 - current message forgotten in vfolders (Michael)
+ XB68974 - Wizard doesn't store smtp auth settings (Michael)
+ XB67496 - html email not rendered in preview pane (Michael)
+ XB67014 - Checking supported auth types doesn't work with new SSL certificate (Michael)
+ XB68006 - Evo crashed after viewing previously-sent email and copying URL from it (Michael)
+ XB68787 - Crash when migrating 1.4 data to 2.0.2 (Michael)
+ XB67622 - SMTP auth usernames containing % character fail (Jeff)
+ - fix pthread_key_delete args (Julio M. Merino Vidal)
+- Removed patch for "Unmatched" vfolder properties dialog (#141458) as this is now in upstream tarball (XB69579 above)
+- Update dependency on e-d-s from 1.0.2 to 1.0.3
+- Update dependency on libgal2 from 2.2.3 to 2.2.4
+
+* Wed Dec 1 2004 David Malcolm - 2.0.2-6
+- Fix broken properties dialog for "Unmatched" vfolder (#141458)
+
+* Wed Oct 27 2004 Christopher Aillon - 2.0.2-4
+- Re-enable s390(x)
+
+* Fri Oct 22 2004 David Malcolm - 2.0.2-3
+- added requirement on gnutls/gnutls-devel
+
+* Fri Oct 22 2004 David Malcolm - 2.0.2-2
+- Fix for #132050 (no entry for Evolution in the menus): use the new redhat-evolution.desktop file provided by redhat-menus-1.13
+
+* Tue Oct 12 2004 David Malcolm - 2.0.2-1
+- Update from 2.0.1 to 2.0.2
+- Updated dependency on e-d-s from 1.0.1 to 1.0.2
+- Updated dependency on libgal2 from 2.2.2 to 2.2.3
+- Updated dependency on gtkhtml3 from 3.3.0 to 3.3.2
+- ppc's mozilla dependency is now in line with the other architectures at 1.7.3
+
+* Sat Oct 9 2004 David Malcolm
+- disable s390/s390x for now
+
+* Fri Oct 8 2004 David Malcolm - 2.0.1-3
+- Fix for #135135, updating the fix for #103826 that removes the evolution.desktop file in "Office"; the file to delete had been renamed to evolution-2.0.desktop
+- Added requirement on redhat-menus, since this supplies the target of our .desktop symlink
+
+* Tue Sep 28 2004 David Malcolm - 2.0.1-2
+- update mozilla dependency from 1.7.2 to 1.7.3, apart from on ppc (and on s390 and s390x, which remain at 1.6, and on ppc64 where it isn't available at all)
+
+* Tue Sep 28 2004 David Malcolm - 2.0.1-1
+- Update from 2.0.0 to 2.0.1
+- Updated dependency on e-d-s from 1.0.0 to 1.0.1
+- Updated dependency on libgal2 from 2.2.0 to 2.2.2
+
+* Mon Sep 20 2004 David Malcolm - 2.0.0-2
+- rebuilt
+
+* Tue Sep 14 2004 David Malcolm - 2.0.0-1
+- Update from 1.5.94.1 to 2.0.0
+- Change source FTP location from 1.5 to 2.0
+- Updated dependency on e-d-s from 0.0.99 to 1.0.0
+- Documentation has now moved from 1.5 to 2.0
+
+* Tue Aug 31 2004 David Malcolm - 1.5.94.1-1
+- updated tarball from 1.5.93 to 1.5.94.1
+- the BASE_VERSION in the configure.in script has finally been updated from 1.5 to 2.0 (affects OAFIIDs, install dirs, binary names etc); updated evo_major and various other parts of the spec-file to reflect this; however documentation is still 1.5 in upstream tarball
+- updated dependency on libgal2 from 2:2.1.14 to 2:2.2.0
+- updated dependency on libsoup from 2.1.13 to 2.2.0
+- updated dependency on e-d-s from 0.0.98 to 0.0.99
+
+* Tue Aug 17 2004 David Malcolm - 1.5.93-2
+- updated gnome-icon-theme requirement from 1.2.0 to 1.3.6 to fix problem with missing stock icons (bz #130142)
+
+* Mon Aug 16 2004 David Malcolm - 1.5.93-1
+- updated tarball from 1.5.92.2 to 1.5.93
+- removed filechooser patch - this is now in the upstream tarball, with a test at configuration time; it was autodetected and enabled in my test build; I've explicitly enabled it to be certain.
+- updated dependency on libgal2 from 2:2.1.13 to 2:2.1.14
+- updated dependency on libsoup from 2.1.12 to 2.1.13
+- updated dependency on e-d-s from 0.0.97 to 0.0.98
+
+* Wed Aug 11 2004 David Malcolm - 1.5.92.2-2
+- Increased mozilla_version from 1.7 to 1.7.2 so that the NSS test looks in the correct place
+
+* Wed Aug 11 2004 David Malcolm - 1.5.92.2-1
+- updated tarball from 1.5.92.1 to 1.5.92.2
+
+* Wed Aug 4 2004 David Malcolm - 1.5.92.1-1
+- updated tarball from 1.5.91 to 1.5.92.1
+- added a dependency on gnome-icon-theme
+- updated dependency on libgal2 from 2:2.1.11 to 2:2.1.13
+- updated dependency on gtkhtml3 from 3.1.17 to 3.3.0
+- updated dependency on libsoup from 2.1.11 to 2.1.12
+- updated dependency on e-d-s from 0.0.95 to 0.0.97
+
+* Mon Jul 26 2004 David Malcolm - 1.5.91-1
+- 1.5.91
+
+* Thu Jul 8 2004 Jeremy Katz - 1.5.90-5
+- use mozilla 1.7 on platforms where it's available
+- check to make sure the appropriate mozilla headers exist if using
+ mozilla nss for ssl or fail the build
+
+* Thu Jul 8 2004 David Malcolm
+- rebuilt
+
+* Wed Jul 7 2004 David Malcolm
+- rebuilt
+
+* Tue Jul 6 2004 David Malcolm - 1.5.90-2
+- Fixed sources file
+
+* Tue Jul 6 2004 David Malcolm - 1.5.90-1
+- 1.5.90; updated requirements on gtkhtml3, libgal2, and e-d-s
+
+* Thu Jun 17 2004 David Malcolm - 1.5.9.2-1
+- 1.5.9.2
+
+* Tue Jun 15 2004 Elliot Lee
+- rebuilt
+
+* Tue Jun 8 2004 David Malcolm - 1.5.9.1-3
+- Replaced /usr/lib with %%{_libdir} in mozills_nss ssl_flags
+
+* Mon Jun 7 2004 David Malcolm - 1.5.9.1-2
+- updated filechooser patch again
+
+* Mon Jun 7 2004 David Malcolm - 1.5.9.1-1
+- 1.5.9.1; updated filechooser patch
+
+* Wed May 26 2004 David Malcolm - 1.5.8-3
+- added ORBit2 and spamassassin requirements
+
+* Mon May 24 2004 David Malcolm - 1.5.8-2
+- Fixed up filechooser patch and re-enabled it
+
+* Fri May 21 2004 David Malcolm - 1.5.8-1
+- 1.5.8; added explicit libbonoboui requirement; disabled filechooser patch for now
+
+* Tue May 4 2004 David Malcolm - 1.5.7-3
+- Added GtkFileChooser patch based on work by Carlos Garnacho Parro (http://lists.ximian.com/archives/public/evolution-patches/2004-March/004867.html); added requirement for GTK 2.4
+
+* Thu Apr 22 2004 David Malcolm - 1.5.7-2
+- added emfv signal fix patch and fix for defaults in switch statements on gcc3.4
+
+* Wed Apr 21 2004 David Malcolm - 1.5.7-1
+- 1.5.7
+
+* Wed Mar 10 2004 Jeremy Katz - 1.5.5-1
+- 1.5.5
+
+* Tue Mar 02 2004 Elliot Lee
+- rebuilt
+
+* Wed Feb 18 2004 Jeremy Katz - 1.5.4-1
+- 1.5.4
+
+* Tue Feb 17 2004 Jeremy Katz
+- buildrequire e-d-s-devel instead of e-d-s (#114712)
+- enable nntp support (#114802)
+
+* Fri Feb 13 2004 Elliot Lee
+- rebuilt
+
+* Tue Jan 27 2004 Jeremy Katz 1.5.3-1
+- 1.5.3
+
+* Wed Jan 21 2004 Jeremy Katz 1.5.2-2
+- size_t/int mismatch compile fix for 64bit platforms
+
+* Wed Jan 14 2004 Jeremy Katz 1.5.2-0
+- 1.5.2
+- add patch to fix gconf warning with schema
+
+* Sun Jan 4 2004 Jeremy Katz 1.5.1-0
+- 1.5.1
+- temporarily disable redhatify patch
+- use mozilla-nss for SSL
+- fix schema names
+
+* Thu Nov 6 2003 Jeremy Katz 1.4.5-8
+- fall back to HELO for ESMTP (#108753)
+
+* Tue Oct 28 2003 Jeremy Katz 1.4.5-7
+- fix title on composer save dialog (#108159)
+
+* Mon Oct 27 2003 Jeremy Katz 1.4.5-6
+- Make imap command length shorter to avoid choking some imap servers
+ (notably cyrus-imap).
+- Make wombat session managed so that we don't hit weird bonobo activation
+ things. This adds a dependency on $DISPLAY for wombat. (#106826)
+
+* Sun Oct 19 2003 Jeremy Katz 1.4.5-5
+- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without
+ IPv6 support
+- add patch from upstream with reply-to-list shortcut (Ctrl-l)
+
+* Wed Oct 15 2003 Jeremy Katz 1.4.5-4
+- really, really remove duplicate menu entry (#103826)
+
+* Tue Oct 14 2003 Jeremy Katz 1.4.5-3
+- Pull in some patches from upstream CVS
+ * Avoid division by zero with POP (X#41610)
+ * Don't mangle headers (X#33545)
+ * Prefix IPV6 numeric hosts properly (X#46006, #105028)
+ * Use proper function for IPV6 reverse lookups (X#46006)
+ * Allow timezone offset to be up to 14 hours (X#49357)
+
+* Mon Oct 13 2003 Jeremy Katz
+- add patch from upstream CVS to fix SMTP syntax problems (#106630)
+- really remove duplicate menu entry (#103826)
+
+* Mon Oct 6 2003 Jeremy Katz
+- make redhat-email.desktop symlink relative (#104391)
+
+* Wed Sep 24 2003 Jeremy Katz
+- add ipv6 support per dwmw2's request
+
+* Tue Sep 23 2003 Jeremy Katz 1.4.5-2
+- 1.4.5
+
+* Wed Sep 17 2003 Jeremy Katz
+- move static libs into -devel (#104399)
+
+* Tue Sep 16 2003 Jeremy Katz 1.4.4-7
+- filter types are gtypes, not ints (#103934)
+
+* Wed Sep 10 2003 Jeremy Katz 1.4.4-6
+- fix from upstream (will be in 1.4.5) to fix menu merging in the
+ composer with new libbonobo
+
+* Fri Sep 5 2003 Jeremy Katz
+- remove the desktop file in Office (#103826)
+
+* Tue Sep 2 2003 Jeremy Katz 1.4.4-5
+- patch from upstream to fix display of some mails in
+ different charsets (#102899)
+- add requires on newer version of ORBit2 (#103386)
+- add patch from upstream (extracted by George Karabin) to use gnome-vfs
+ mime icon lookup where available (#102553)
+
+* Fri Aug 22 2003 Jeremy Katz 1.4.4-4
+- include static libs (#102834)
+
+* Wed Aug 6 2003 Jeremy Katz 1.4.4-3
+- add a -devel subpackage (#99376)
+
+* Mon Aug 4 2003 Jeremy Katz 1.4.4-1
+- 1.4.4
+
+* Wed Jul 30 2003 Jeremy Katz
+- buildrequires fixup from Ville Skytta (#101325)
+
+* Thu Jul 24 2003 Jeremy Katz 1.4.3-6
+- include tagoh's patch for printing cjk contacts (committed upstream, #99374)
+
+* Tue Jul 22 2003 Nalin Dahyabhai 1.4.3-5
+- rebuild
+
+* Tue Jul 15 2003 Jeremy Katz 1.4.3-4
+- build on all arches again
+
+* Mon Jul 14 2003 Jeremy Katz 1.4.3-3
+- rebuild
+
+* Thu Jul 10 2003 Jeremy Katz 1.4.3-1
+- 1.4.3
+
+* Thu Jun 19 2003 Jeremy Katz
+- make gal version dep more explicit
+
+* Fri Jun 13 2003 Jeremy Katz
+- fix desktop file (#97162)
+
+* Tue Jun 10 2003 Jeremy Katz 1.4.0-2
+- rebuild
+- excludearch ppc64 for now
+
+* Mon Jun 9 2003 Jeremy Katz 1.4.0-1
+- 1.4.0
+
+* Wed Jun 5 2003 Elliot Lee
+- rebuilt
+
+* Thu Jun 5 2003 Jeremy Katz 1.3.92-2
+- rebuild
+
+* Wed Jun 4 2003 Jeremy Katz
+- buildrequires gettext (#92276)
+
+* Sun May 25 2003 Jeremy Katz 1.3.92-1
+- 1.3.92
+
+* Wed May 7 2003 Jeremy Katz 1.3.3-2
+- fix default for /schemas/apps/evolution/mail/display/mime_types
+
+* Tue May 6 2003 Jeremy Katz 1.3.3-1
+- 1.3.3
+
+* Sun May 4 2003 Jeremy Katz 1.3.2-2
+- enable pilot support
+- add redhatify patch back
+
+* Tue Apr 22 2003 Jeremy Katz
+- add a /usr/bin/evolution symlink
+
+* Mon Apr 21 2003 Jeremy Katz
+- fix gnome-spell version requirement
+
+* Wed Apr 16 2003 Jeremy Katz 1.3.2-1
+- add trivial fix for evolution-mail schema key (ximian #41419)
+
+* Tue Apr 15 2003 Jeremy Katz
+- update to 1.3
+- don't build with pilot support for now
+- don't redhat-ify the summary prefs for now
+
+* Sun Apr 6 2003 Jeremy Katz 1.2.4-2
+- fix krb5 libdir for lib64 systems
+
+* Sun Apr 6 2003 Jeremy Katz 1.2.4-1
+- update to 1.2.4
+
+* Thu Apr 3 2003 Jeremy Katz 1.2.2-7
+- oops, fix a tyop
+
+* Thu Apr 3 2003 Jeremy Katz 1.2.2-6
+- add a few cleanups for 64bit cleanliness (#86347)
+
+* Sun Mar 30 2003 Jeremy Katz
+- add some buildrequires (#87612)
+
+* Mon Mar 24 2003 Jeremy Katz 1.2.3-1
+- update to 1.2.3
+
+* Wed Mar 19 2003 Jeremy Katz 1.2.2-5
+- security patches from upstream
+ - sanity check UUEncoding header before decoding (CAN-2003-0128)
+ - don't decode doubly UUEncoded content (CAN-2003-0129)
+ - don't use a bonobo component to display things without registered
+ handlers (CAN-2003-0130)
+
+* Mon Feb 24 2003 Elliot Lee 1.2.2-4
+- debuginfo rebuild
+
+* Thu Feb 20 2003 Jeremy Katz 1.2.2-3
+- memleak patch had some bits that weren't supposed to be there. update
+ to newer from upstream.
+- fix directory checking in proxy patch
+
+* Thu Feb 20 2003 Jeremy Katz 1.2.2-2
+- add missing build dep (#84388)
+- add patch from upstream for evolution-mail memleak
+- add patch from upstream to use the gnome2 proxy settings by default
+
+* Fri Feb 7 2003 Jeremy Katz 1.2.2-1
+- 1.2.2
+- build on x86_64
+
+* Wed Jan 22 2003 Tim Powers
+- rebuilt
+
+* Tue Jan 7 2003 Nalin Dahyabhai 1.2.1-4
+- rebuild
+
+* Fri Jan 3 2003 Nalin Dahyabhai
+- if building with OpenSSL, attempt to get cflags and ldflags from pkgconfig
+
+* Thu Jan 2 2003 Jeremy Katz 1.2.1-3
+- we don't want to use native POSIX threads for mutexes in db3, override them
+
+* Mon Dec 16 2002 Tim Powers 1.2.1-2
+- rebuild
+
+* Fri Dec 13 2002 Jeremy Katz 1.2.1-1
+- update to 1.2.1
+
+* Thu Dec 12 2002 Jeremy Katz 1.2.0-6
+- require a newer soup, the old one Has Bugs (tm)
+- excludearch x86_64; getting a R_X86_64_32S relocation in libical
+ although everything appears to be built with -fPIC correctly
+
+* Tue Dec 10 2002 Jeremy Katz 1.2.0-5
+- patch for multilib krb5
+
+* Mon Dec 2 2002 Jeremy Katz 1.2.0-4
+- add upstream patch to handle LDAPv3 better
+- add upstream patch to fix shell memory leaks
+- add upstream patch to fix ldap scope selection
+- build with openssl instead of mozilla-nss since it's available on
+ more platforms
+- build on all arches
+
+* Fri Nov 22 2002 Jeremy Katz
+- require bonobo-conf, not -devel (#78398)
+
+* Wed Nov 20 2002 Florian La Roche 1.2.0-3
+- disable pilot support for mainframe
+
+* Mon Nov 18 2002 Jeremy Katz 1.2.0-2
+- macro-ify the mozilla version to make it easier to build against
+ newer mozillas with headers in new locations
+- buildrequire pilot-link-devel (#78077)
+- drop uneeded ldapv3 patch (toshok says 1.2 already handles this)
+- drop unneeded patch for ordering of the libdb checks
+- add fejj's patch to always subscribe to the inbox from evolution-patches
+
+* Tue Nov 12 2002 Jeremy Katz 1.2.0-1
+- 1.2.0
+
+* Sat Nov 2 2002 Jeremy Katz 1.1.90-2
+- reenable pilot support
+- redhatify
+
+* Fri Nov 1 2002 Jeremy Katz 1.1.90-1
+- update to 1.1.90
+
+* Thu Oct 31 2002 Jeremy Katz
+- include mozilla epochs in requires (#74577)
+- add build requires on newer oaf (#76801)
+
+* Thu Oct 24 2002 Jeremy Katz 1.1.2-1
+- update to 1.1.2
+- remove unpackaged files from the buildrooot
+- disable pilot support for now
+
+* Tue Sep 3 2002 Jeremy Katz 1.0.8-10
+- add freetype-devel to build requires (#73319)
+
+* Mon Sep 2 2002 Owen Taylor
+- Fix a problem where evolution-mail right click items corrupted the stack
+ (#67992)
+
+* Thu Aug 29 2002 Jeremy Katz 1.0.8-9
+- don't install two desktop files (#72871)
+
+* Wed Aug 28 2002 Preston Brown 1.0.8-8
+- absolute symlink .desktop file (#72913)
+
+* Thu Aug 22 2002 han Ngo 1.0.8-7
+- rebuild against new pilot-link
+
+* Sat Aug 10 2002 Florian La Roche
+- bzip2 source
+
+* Tue Aug 6 2002 Than Ngo 1.0.8-5
+- rebuild against new pilot-link-0.11.2
+
+* Thu Jul 18 2002 Jeremy Katz 1.0.8-4
+- rebuild against new gnome-pilot
+
+* Tue Jul 9 2002 Jeremy Katz 1.0.8-3
+- remove static and libtool archives for importers and camel-providers (#68222)
+- do desktop-file-install magic
+- remove dead sites from summary list (#64522)
+- support openldap protocol version 3 based off of Nalin's autofs changes
+
+* Mon Jul 8 2002 Jeremy Katz 1.0.8-2
+- fix openldap-devel buildrequire
+
+* Mon Jul 1 2002 Jeremy Katz 1.0.8-1
+- 1.0.8
+
+* Thu Jun 27 2002 Jeremy Katz 1.0.7-2
+- include patch to omf files from otaylor@redhat.com to fix
+ scrollkeeper validation errors
+
+* Sun Jun 23 2002 Jeremy Katz 1.0.7-1
+- update to 1.0.7
+- excludearch alpha while mozilla isn't being built there
+
+* Sun May 26 2002 Tim Powers 1.0.5-2
+- automated rebuild
+
+* Mon May 13 2002 Jeremy Katz 1.0.5-1
+- update to 1.0.5
+
+* Fri May 3 2002 Jeremy Katz 1.0.3-6
+- add patch to fix spool unread counts (#64198)
+- build with the fix for the crasher mail sent to
+ evolution-list (ximian #24140)
+
+* Mon Apr 15 2002 Jeremy Katz 1.0.3-4
+- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl
+ since it's been committed to the branch and fixes the problem for me
+- include patch from tagoh(at)redhat.com to change the default charset
+ for Japanese to ISO-2022-JP (#63214)
+
+* Wed Apr 10 2002 Jeremy Katz 1.0.3-3
+- minor tweaks to the redhatify patch
+- make accepting appointments sent to mailing lists work
+- use the RFC specified LDAP attribs for freebusy and calendarURI
+ in addressbook
+- fix a crash in the startup wizard
+
+* Sun Mar 31 2002 Jeremy Katz 1.0.3-2
+- move desktop file to /etc/X11/applnk (#62399)
+
+* Sun Mar 24 2002 Jeremy Katz 1.0.3-1
+- update to evolution 1.0.3
+- change summary view to show a recent errata list by default
+
+* Thu Mar 14 2002 Jeremy Katz
+- put correct path to nspr includes on configure command line
+
+* Mon Mar 11 2002 Jeremy Katz 1.0.2-3
+- mozilla 0.9.9 has nspr and nss subpackages, hooray! rip out the static
+ libnss linkage and just link against what is provided dynamically
+- kill the -devel subpackage since it's of questionable use
+- explicitly require mozilla-nss and mozilla-nspr packages to make it easier
+ to resolve the requirements
+
+* Thu Feb 21 2002 Jeremy Katz 1.0.2-2
+- rebuild in new environment
+- temporarily exclude on ia64 again
+
+* Thu Jan 31 2002 Jeremy Katz 1.0.2-1
+- update to 1.0.2
+
+* Mon Jan 28 2002 Jeremy Katz 1.0.1-4
+- build on ia64 now that mozilla exists for ia64
+
+* Sun Jan 27 2002 Jeremy Katz 1.0.1-3
+- rebuild in new environment
+- add pilot support
+
+* Sun Jan 13 2002 Jeremy Katz 1.0.1-2
+- rebuild without mozilla-psm in the buildroot so libnss is linked
+ statically as intended
+
+* Sat Jan 12 2002 Jeremy Katz 1.0.1-1
+- update to 1.0.1
+- patch for autoconf 2.52 accepted upstream
+- include man page
+- use --with-sub-version=" (%%{version}-%%{release})"
+
+* Tue Dec 18 2001 Jeremy Katz 1.0-2
+- really disable news
+- add patch from Jens Petersen to hopefully get
+ builds working with autoconf 2.52
+- conditionalize static libnss stuff so that it can go away when we
+ have a mozilla with shared libnss
+
+* Thu Dec 6 2001 Jeremy Katz 1.0-1.7.2
+- add patches off of branch for:
+ * do not show up as Preview Release in version string
+ * have next/previous work with multiple selected messages
+- build without pilot support
+
+* Mon Dec 3 2001 Jeremy Katz 1.0-1
+- and bump to 1.0
+
+* Sun Dec 2 2001 Jeremy Katz
+- let's build with an included copy of libnss now since OpenSSL is support
+ is disabled on the 1.0 branch
+- build with --enable-dot-locking=no
+- excludearch ia64 again now that we need libnspr
+
+* Mon Nov 26 2001 Jeremy Katz
+- build with gnome-pilot and krb5 support
+- conditionalize ldap, pilot and krb5 support
+- clean up buildrequires some
+
+* Sat Nov 17 2001 Jeremy Katz
+- we can build on ia64 since we're using openssl instead of nspr
+- disable non-functional nntp support
+- 0.99.2 (rc2)
+
+* Fri Nov 9 2001 Jeremy Katz
+- add explicit requires on current bonobo, oaf, and GConf to help people
+ help themselves
+- s/Copyright/License/
+
+* Thu Nov 8 2001 Jeremy Katz
+- add a patch to revert changes to camel-tcp-stream-openssl; appears to
+ fix the SSL hangs
+
+* Wed Nov 7 2001 Jeremy Katz
+- fix filelist to include libical zoneinfo
+- add devel subpackage with includes and static libs
+
+* Mon Nov 5 2001 Jeremy Katz
+- updated to 0.99.0 aka 1.0 RC1
+
+* Tue Oct 23 2001 Havoc Pennington
+- 0.16 snagged from Ximian GNOME
+
+* Fri Oct 5 2001 Havoc Pennington
+- initial build based on David Sainty's specfile
+
+* Thu Oct 04 2001 David Sainty
+- Updated to 0.15.99, 20011004 from cvs.
+
+* Wed Sep 05 2001 David Sainty
+- Updated to 0.13.99, 20010905 from cvs.
+
+* Mon Sep 03 2001 David Sainty
+- Updated to 0.13.99, 20010903 from cvs.
+- Fixed Requires + BuildRequires
+
+* Mon Aug 06 2001 David Sainty
+- Updated to 0.12.99, 20010806 from cvs.
+
+* Mon Aug 06 2001 David Sainty
+- Relocated libical* from /usr/lib due to kdepim, -2
+
+* Mon Aug 06 2001 David Sainty
+- First spec file for evolution.
+
diff --git a/flatpak-evolution-fix-service-names.sh b/flatpak-evolution-fix-service-names.sh
deleted file mode 100755
index 9454543..0000000
--- a/flatpak-evolution-fix-service-names.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# see https://gitlab.gnome.org/GNOME/glib/issues/1737
-# previous versions used milliseconds instead of seconds as the timeout argument",
-(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000
-
-sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \
- -e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \
- -e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \
- -e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|"
diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
deleted file mode 100644
index 6a311fc..0000000
--- a/flatpak-evolution-wrapper.sh.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
- /app/bin/evolution.bin "$@"
-else
- export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
- export GIO_USE_NETWORK_MONITOR=base
- gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
-
- LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
- if [ "${LINES}" = "0" ]; then
- /app/libexec/evolution-source-registry &
- gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@
- fi
-
- LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l)
- if [ "${LINES}" = "0" ]; then
- /app/libexec/evolution-addressbook-factory -r &
- gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@
- fi
-
- LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l)
- if [ "${LINES}" = "0" ]; then
- /app/libexec/evolution-calendar-factory -r &
- gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@
- fi
-
- /app/bin/evolution.bin "$@"
-fi
diff --git a/rpminspect.yaml b/rpminspect.yaml
deleted file mode 100644
index 1ba6977..0000000
--- a/rpminspect.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-runpath:
- allowed_paths:
- - /usr/lib/evolution
- - /usr/lib64/evolution
diff --git a/sources b/sources
index b11ec23..6121080 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d
+cea13421ea95707e89c0311100714573 evolution-2.5.91.tar.bz2