Fix files list, again.

- Drop the libbonobo, libbonoboui and libgnomeui dependencies.

.cvsignore

@@ -0,0 +1 @@
+evolution-2.29.2-kill-bonobo-adadf13.tar.bz2

.gitignore

@@ -1 +0,0 @@
-/evolution-*.tar.xz

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: evolution
+# $Id: Makefile,v 1.1 2004/09/09 04:34:33 cvsdist Exp $
+NAME := evolution
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

configurable-dbus-prefix.patch

@@ -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);

evolution-1.4.4-ldap-x86_64-hack.patch

@@ -0,0 +1,12 @@
+diff -up evolution-2.24.1/configure.ldaphack evolution-2.24.1/configure
+--- evolution-2.24.1/configure.ldaphack	2008-10-19 23:37:55.000000000 -0400
++++ evolution-2.24.1/configure	2008-10-21 13:16:16.000000000 -0400
+@@ -28471,7 +28471,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
+   $as_echo_n "(cached) " >&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
+ /* confdefs.h.  */
+ _ACEOF

evolution-2.5.4-fix-conduit-dir.patch

@@ -0,0 +1,96 @@
+diff -up evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.am
+--- evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir	2008-06-15 23:20:16.000000000 -0400
++++ evolution-2.23.4/addressbook/conduit/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -25,7 +25,7 @@ e-address.conduit: e-address.conduit.in
+ 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+ 	    $< > $@
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-address.conduit
+ 
+ BUILT_SOURCES = $(conduit_DATA)
+diff -up evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.in
+--- evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir	2008-06-16 07:11:50.000000000 -0400
++++ evolution-2.23.4/addressbook/conduit/Makefile.in	2008-07-18 09:10:29.000000000 -0400
+@@ -421,7 +421,7 @@ libeaddress_conduit_la_LIBADD = \
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
+ 	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-address.conduit
+ BUILT_SOURCES = $(conduit_DATA)
+ CLEANFILES = $(BUILT_SOURCES)
+diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.am
+--- evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-calendar.conduit: e-calendar.conduit.i
+ 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+ 	    $< > $@
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-calendar.conduit
+ 
+ BUILT_SOURCES = $(conduit_DATA)
+diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.in
+--- evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.in	2008-07-18 09:13:04.000000000 -0400
+@@ -426,7 +426,7 @@ libecalendar_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
+ 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-calendar.conduit
+ BUILT_SOURCES = $(conduit_DATA)
+ CLEANFILES = $(BUILT_SOURCES)
+diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.am
+--- evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/memo/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-memo.conduit: e-memo.conduit.in
+ 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+ 	    $< > $@
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-memo.conduit
+ 
+ BUILT_SOURCES = $(conduit_DATA)
+diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.in
+--- evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/memo/Makefile.in	2008-07-18 09:12:17.000000000 -0400
+@@ -424,7 +424,7 @@ libememo_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
+ 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-memo.conduit
+ BUILT_SOURCES = $(conduit_DATA)
+ CLEANFILES = $(BUILT_SOURCES)
+diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.am
+--- evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir	2008-06-15 23:22:48.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/todo/Makefile.am	2008-07-18 09:10:29.000000000 -0400
+@@ -28,7 +28,7 @@ e-todo.conduit: e-todo.conduit.in
+ 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
+ 	    $< > $@
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-todo.conduit
+ 
+ BUILT_SOURCES = $(conduit_DATA)
+diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.in
+--- evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir	2008-06-16 07:11:53.000000000 -0400
++++ evolution-2.23.4/calendar/conduits/todo/Makefile.in	2008-07-18 09:11:53.000000000 -0400
+@@ -424,7 +424,7 @@ libetodo_conduit_la_LIBADD = \
+ 	$(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la	\
+ 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+ 
+-conduitdir = $(datadir)/gnome-pilot/conduits/
++conduitdir = $(libdir)/gnome-pilot/conduits/
+ conduit_DATA = e-todo.conduit
+ BUILT_SOURCES = $(conduit_DATA)
+ CLEANFILES = $(BUILT_SOURCES)

evolution-2.9.1-im-context-reset.patch

@@ -0,0 +1,12 @@
+--- evolution-2.9.1/calendar/gui/e-day-view.c.im-context-reset	2006-11-06 10:14:26.000000000 -0500
++++ evolution-2.9.1/calendar/gui/e-day-view.c	2006-11-06 10:15:39.000000000 -0500
+@@ -6928,6 +6928,9 @@
+ 	if (!event->canvas_item)
+ 		return;
+ 
++	/* Reset IM context. */
++	gtk_im_context_reset (E_TEXT (event->canvas_item)->im_context);
++
+ 	/* We must grab the focus before setting the initial text, since
+ 	   grabbing the focus will result in a call to
+ 	   e_day_view_on_editing_started(), which will reset the text to get

evolution-kb-override-version.patch

@@ -0,0 +1,33 @@
+diff -up evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.2-kill-bonobo-0a47d87/configure.ac
+--- evolution-2.29.2-kill-bonobo-0a47d87/configure.ac.override-version	2009-09-08 19:41:23.000000000 -0400
++++ evolution-2.29.2-kill-bonobo-0a47d87/configure.ac	2009-09-08 22:53:53.636195371 -0400
+@@ -1,7 +1,7 @@
+ dnl Evolution Versions
+ m4_define([evo_major_version], [2])
+-m4_define([evo_minor_version], [29])
+-m4_define([evo_micro_version], [2])
++m4_define([evo_minor_version], [27])
++m4_define([evo_micro_version], [99])
+ m4_define([evo_version],
+ 	[evo_major_version.evo_minor_version.evo_micro_version])
+ m4_define([evo_stable_version],
+@@ -13,8 +13,8 @@ dnl Base Version: This is for API/versio
+ dnl Bonobo server files.  This should always be the major/minor of
+ dnl the stable version or stable version to be.  Note, this is set
+ dnl the way it is so that GETTEXT_PACKAGE will be parsed correctly.
+-BASE_VERSION=2.30
+-m4_define([base_version], [2.30])
++BASE_VERSION=2.28
++m4_define([base_version], [2.28])
+ 
+ dnl Upgrade Revision: This is for triggering migration calls between
+ dnl varying versions. Reset to 0 whenever BASE_VERSION changes.
+@@ -49,7 +49,7 @@ GTKHTML_PACKAGE=3.14
+ dnl Required Packages
+ m4_define([glib_minimum_version], [2.20.0])
+ m4_define([gtk_minimum_version], [2.16.0])
+-m4_define([eds_minimum_version], [evo_version])
++m4_define([eds_minimum_version], [2.27.1])
+ m4_define([gnome_icon_theme_minimum_version], [2.19.91])
+ m4_define([gnome_desktop_minimum_version], [2.26.0])
+ m4_define([libgtkhtml_minimum_version], [3.29.1])

flatpak-evolution-fix-service-names.sh

@@ -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}|"

flatpak-evolution-wrapper.sh.in

@@ -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

rpminspect.yaml

@@ -1,5 +0,0 @@
----
-runpath:
-    allowed_paths:
-        - /usr/lib/evolution
-        - /usr/lib64/evolution

sources

@@ -1 +1 @@
-SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d
+a4e70c3dacff4169f9ae4fcc626b7a27  evolution-2.29.2-kill-bonobo-adadf13.tar.bz2