From d484136fe771fc653394ef11cb733360b440959b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 17 Jun 2009 22:34:31 +0000 Subject: [PATCH 01/75] - Snapshot of "kill-bonobo" branch at commit b03af89. --- .cvsignore | 2 +- evolution.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index a092b61..626d4b1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.3.tar.bz2 +evolution-2.27.3-kill-bonobo-b03af89.tar.bz2 diff --git a/evolution.spec b/evolution.spec index a3c6d6d..9e8d330 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,3 +1,6 @@ +# This is an unofficial RPM for testing Evolution's kill-bonobo branch. +%define hash b03af89 + %define dbus_glib_version 0.70 %define dbus_version 1.0 %define glib2_version 2.16.0 @@ -42,13 +45,13 @@ Name: evolution Version: 2.27.3 -Release: 1%{?dist} +Release: 1.KB.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2 +Source: %{name}-%{version}-kill-bonobo-%{hash}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -218,7 +221,7 @@ Requires: %{name} = %{version}-%{release} This package contains supplemental utilities for %{name} that require Perl. %prep -%setup -q -n evolution-%{version} +%setup -q -n evolution-%{version}-kill-bonobo-%{hash} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset @@ -669,6 +672,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Wed Jun 17 2009 Matthew Barnes - 2.27.3-1.KB.1.fc12 +- Snapshot of "kill-bonobo" branch at commit b03af89. + * Mon Jun 15 2009 Matthew Barnes - 2.27.3-1.fc12 - Update to 2.27.3 diff --git a/sources b/sources index 03f347e..f11795d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31d95df4c3a8f078443ec22a57742aea evolution-2.27.3.tar.bz2 +ed1babe1a703010d9207656067d30559 evolution-2.27.3-kill-bonobo-b03af89.tar.bz2 From 6ad477d982153837484ca8a69db4e04fb07f06b5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 17 Jun 2009 22:49:15 +0000 Subject: [PATCH 02/75] Add missing BR. --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 9e8d330..d4f7531 100644 --- a/evolution.spec +++ b/evolution.spec @@ -115,6 +115,7 @@ BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel BuildRequires: pkgconfig +BuildRequires: unique-devel %if %{use_mozilla_nss} BuildRequires: nspr-devel From c653c6eb43e2b3db2eeddcfa0debc8205f61a05a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 19 Jun 2009 23:15:35 +0000 Subject: [PATCH 03/75] - Snapshot of "kill-bonobo" branch at commit c6aabcc. --- .cvsignore | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 626d4b1..6997128 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.3-kill-bonobo-b03af89.tar.bz2 +evolution-2.27.3-kill-bonobo-c6aabcc.tar.bz2 diff --git a/evolution.spec b/evolution.spec index d4f7531..2d1e2a6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash b03af89 +%define hash c6aabcc %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.3 -Release: 1.KB.1%{?dist} +Release: 1.kb.2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -673,7 +673,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog -* Wed Jun 17 2009 Matthew Barnes - 2.27.3-1.KB.1.fc12 +* Fri Jun 19 2009 Matthew Barnes - 2.27.3-1.kb.2.fc12 +- Snapshot of "kill-bonobo" branch at commit c6aabcc. + +* Wed Jun 17 2009 Matthew Barnes - 2.27.3-1.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit b03af89. * Mon Jun 15 2009 Matthew Barnes - 2.27.3-1.fc12 diff --git a/sources b/sources index f11795d..6941d46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ed1babe1a703010d9207656067d30559 evolution-2.27.3-kill-bonobo-b03af89.tar.bz2 +f4df43560e2fed5510c0d2ebf19dffe0 evolution-2.27.3-kill-bonobo-c6aabcc.tar.bz2 From 82489f80a534e5fc0460a5751a2d7541fa2205eb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 19 Jun 2009 23:54:51 +0000 Subject: [PATCH 04/75] Fix sources. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 6941d46..3616249 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4df43560e2fed5510c0d2ebf19dffe0 evolution-2.27.3-kill-bonobo-c6aabcc.tar.bz2 +34e0a560078dd1d7919329479fdeba64 evolution-2.27.3-kill-bonobo-c6aabcc.tar.bz2 From 6e891998db19f7e7ec5f7bd30d8daa150f319e07 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Jun 2009 00:30:33 +0000 Subject: [PATCH 05/75] - Snapshot of "kill-bonobo" branch at commit c6aabcc. - Adjust %files for non-working plugins. --- evolution.spec | 107 +++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 62 deletions(-) diff --git a/evolution.spec b/evolution.spec index 2d1e2a6..0472380 100644 --- a/evolution.spec +++ b/evolution.spec @@ -378,13 +378,13 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null +#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null +#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null +#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null %post bogofilter @@ -438,24 +438,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/evolution/%{evo_major} # Bonobo components: -%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar.server %{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Mail.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Shell.server %dir %{_libdir}/evolution %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/%{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.* @@ -464,7 +456,7 @@ rm -rf $RPM_BUILD_ROOT %{_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-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.* @@ -480,7 +472,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/evolution/%{evo_major} %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export %{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify -%{_libexecdir}/evolution/%{evo_major}/evolution-backup +#%{_libexecdir}/evolution/%{evo_major}/evolution-backup %{_libexecdir}/evolution/%{evo_major}/killev # The plugin directory: @@ -491,9 +483,6 @@ rm -rf $RPM_BUILD_ROOT # 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-mail-account-disable.eplug -%{evo_plugin_dir}/libmail-account-disable.so - %{evo_plugin_dir}/org-gnome-addressbook-file.eplug %{evo_plugin_dir}/liborg-gnome-addressbook-file.so @@ -506,9 +495,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-audio-inline.so %endif -%{evo_plugin_dir}/org-gnome-backup-restore.eplug -%{evo_plugin_dir}/org-gnome-backup-restore.xml -%{evo_plugin_dir}/liborg-gnome-backup-restore.so +#%{evo_plugin_dir}/org-gnome-backup-restore.eplug +#%{evo_plugin_dir}/org-gnome-backup-restore.xml +#%{evo_plugin_dir}/liborg-gnome-backup-restore.so %{evo_plugin_dir}/org-gnome-evolution-caldav.eplug %{evo_plugin_dir}/liborg-gnome-evolution-caldav.so @@ -519,20 +508,17 @@ rm -rf $RPM_BUILD_ROOT %{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-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-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-email-custom-header.eplug -%{evo_plugin_dir}/liborg-gnome-email-custom-header.so +#%{evo_plugin_dir}/org-gnome-email-custom-header.eplug +#%{evo_plugin_dir}/liborg-gnome-email-custom-header.so %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so @@ -540,67 +526,63 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-google.eplug %{evo_plugin_dir}/liborg-gnome-evolution-google.so -%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so +#%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug +#%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.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-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-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-gw-account-setup.eplug +#%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so -%{evo_plugin_dir}/org-gnome-itip-formatter.eplug -%{evo_plugin_dir}/liborg-gnome-itip-formatter.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-mailing-list-actions.xml +#%{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug +#%{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so +#%{evo_plugin_dir}/org-gnome-mailing-list-actions.xml %{evo_plugin_dir}/org-gnome-mail-notification.eplug %{evo_plugin_dir}/liborg-gnome-mail-notification.so -%{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-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-mark-all-read.eplug %{evo_plugin_dir}/liborg-gnome-mark-all-read.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-prefer-plain.eplug -%{evo_plugin_dir}/liborg-gnome-prefer-plain.so +#%{evo_plugin_dir}/org-gnome-prefer-plain.eplug +#%{evo_plugin_dir}/liborg-gnome-prefer-plain.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}/org-gnome-publish-calendar.eplug +#%{evo_plugin_dir}/liborg-gnome-publish-calendar.so +#%{evo_plugin_dir}/org-gnome-publish-calendar.xml %{evo_plugin_dir}/org-gnome-save-calendar.eplug %{evo_plugin_dir}/liborg-gnome-save-calendar.so -%{evo_plugin_dir}/org-gnome-select-one-source.eplug -%{evo_plugin_dir}/liborg-gnome-select-one-source.so - %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so -%{evo_plugin_dir}/templates.glade -%{evo_plugin_dir}/org-gnome-templates.eplug -%{evo_plugin_dir}/liborg-gnome-templates.so +#%{evo_plugin_dir}/templates.glade +#%{evo_plugin_dir}/org-gnome-templates.eplug +#%{evo_plugin_dir}/liborg-gnome-templates.so %{evo_plugin_dir}/org-gnome-vcard-inline.eplug %{evo_plugin_dir}/liborg-gnome-vcard-inline.so @@ -675,6 +657,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Jun 19 2009 Matthew Barnes - 2.27.3-1.kb.2.fc12 - Snapshot of "kill-bonobo" branch at commit c6aabcc. +- Adjust %%files for non-working plugins. * Wed Jun 17 2009 Matthew Barnes - 2.27.3-1.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit b03af89. From 09ff23b11f30f34656f2fcac73a13835fb3e2004 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Jun 2009 01:07:56 +0000 Subject: [PATCH 06/75] Fix more stuff. --- evolution.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0472380..923b204 100644 --- a/evolution.spec +++ b/evolution.spec @@ -407,12 +407,12 @@ rm -rf $RPM_BUILD_ROOT # GConf schemas: %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas -%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas +#%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas -%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas -%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas +#%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas +#%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas %{_sysconfdir}/gconf/schemas/evolution-mail.schemas # The main executable @@ -441,7 +441,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_major} -%dir %{_libdir}/evolution/%{evo_major}/components # Shared libraries: %{_libdir}/evolution/%{evo_major}/libeabutil.so.* @@ -458,12 +457,12 @@ rm -rf $RPM_BUILD_ROOT %{_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-a11y.so.* %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so.* +#%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* +#%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so.* %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.* +#%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.* %{_libdir}/evolution/%{evo_major}/libfilter.so.* %{_libdir}/evolution/%{evo_major}/libmenus.so.* From 1a803c954874c5228270e0d8028ba2c0182cde53 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Jun 2009 01:44:13 +0000 Subject: [PATCH 07/75] More fixes. --- evolution.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index 923b204..71f3de6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -598,7 +598,7 @@ rm -rf $RPM_BUILD_ROOT %{_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}/libefilterbar.so %{_libdir}/evolution/%{evo_major}/libemiscwidgets.so %{_libdir}/evolution/%{evo_major}/libeshell.so %{_libdir}/evolution/%{evo_major}/libessmime.so @@ -607,14 +607,14 @@ rm -rf $RPM_BUILD_ROOT %{_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-a11y.so %{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.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-mail-shared.so +#%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so +#%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so %{_libdir}/evolution/%{evo_major}/libevolution-smime.so -%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so +#%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so %{_libdir}/evolution/%{evo_major}/libfilter.so %{_libdir}/evolution/%{evo_major}/libmenus.so From 6318496ddd6a80f77fc9587dcfdb0a0455728d34 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Jun 2009 02:27:48 +0000 Subject: [PATCH 08/75] Add unpackaged files. --- evolution.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 71f3de6..6e64db4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -382,6 +382,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null #gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null #gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null @@ -409,6 +410,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas #%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas +%{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas #%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas @@ -437,10 +439,11 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/evolution %{_datadir}/evolution/%{evo_major} -# Bonobo components: +# Modules: %{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_major} +%{_libdir}/evolution/%{evo_major}/modules # Shared libraries: %{_libdir}/evolution/%{evo_major}/libeabutil.so.* @@ -463,6 +466,7 @@ rm -rf $RPM_BUILD_ROOT #%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so.* %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* #%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.* +%{_libdir}/evolution/%{evo_major}/libcal-gui.so.* %{_libdir}/evolution/%{evo_major}/libfilter.so.* %{_libdir}/evolution/%{evo_major}/libmenus.so.* @@ -525,6 +529,12 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-google.eplug %{evo_plugin_dir}/liborg-gnome-evolution-google.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-evolution-profiler.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-profiler.so + #%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug #%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so @@ -536,6 +546,9 @@ rm -rf $RPM_BUILD_ROOT #%{evo_plugin_dir}/org-gnome-folder-permissions.xml #%{evo_plugin_dir}/org-gnome-folder-subscription.xml +%{evo_plugin_dir}/org-gnome-external-editor.eplug +%{evo_plugin_dir}/liborg-gnome-external-editor.so + #%{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 @@ -591,6 +604,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) +%{_datadir}/gtk-doc/html/eshell %{_includedir}/evolution-%{evo_major} %{_libdir}/pkgconfig/evolution-plugin.pc %{_libdir}/pkgconfig/evolution-shell.pc From aa28dc124918b26f6f54215a62256677ae7499c0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Jun 2009 03:01:06 +0000 Subject: [PATCH 09/75] Trial and error is fun. --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 6e64db4..dd3d55f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -466,7 +466,6 @@ rm -rf $RPM_BUILD_ROOT #%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so.* %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* #%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.* -%{_libdir}/evolution/%{evo_major}/libcal-gui.so.* %{_libdir}/evolution/%{evo_major}/libfilter.so.* %{_libdir}/evolution/%{evo_major}/libmenus.so.* From ec05eaf89c25c527382b679549f45e08dd031934 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Jun 2009 03:43:20 +0000 Subject: [PATCH 10/75] Try again. --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index dd3d55f..5e75270 100644 --- a/evolution.spec +++ b/evolution.spec @@ -371,6 +371,9 @@ done grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang +# FIXME -- Don't install this. +rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_major}/libcal-gui.so + %post /sbin/ldconfig scrollkeeper-update -q From 44840f6cd8b48ddbe23ea35f1aefdd23bd985682 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 20 Jun 2009 14:29:40 +0000 Subject: [PATCH 11/75] - Snapshot of "kill-bonobo" branch at commit ce7537b. --- .cvsignore | 2 +- evolution.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6997128..5807fb4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.3-kill-bonobo-c6aabcc.tar.bz2 +evolution-2.27.3-kill-bonobo-ce7537b.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 5e75270..d628d48 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash c6aabcc +%define hash ce7537b %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.3 -Release: 1.kb.2%{?dist} +Release: 1.kb.3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -371,9 +371,6 @@ done grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang -# FIXME -- Don't install this. -rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_major}/libcal-gui.so - %post /sbin/ldconfig scrollkeeper-update -q @@ -670,6 +667,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Sat Jun 20 2009 Matthew Barnes - 2.27.3-1.kb.3.fc12 +- Snapshot of "kill-bonobo" branch at commit ce7537b. + * Fri Jun 19 2009 Matthew Barnes - 2.27.3-1.kb.2.fc12 - Snapshot of "kill-bonobo" branch at commit c6aabcc. - Adjust %%files for non-working plugins. diff --git a/sources b/sources index 3616249..3895ab9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34e0a560078dd1d7919329479fdeba64 evolution-2.27.3-kill-bonobo-c6aabcc.tar.bz2 +fabad798175702da4c58582cd6bd42fa evolution-2.27.3-kill-bonobo-ce7537b.tar.bz2 From 54a73d3b6cb255b704aad83b49cb333b661129ca Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 23 Jun 2009 14:40:58 +0000 Subject: [PATCH 12/75] - Rebuild to keep N-V-R ahead of Rawhide. --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index d628d48..c7d8354 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.3 -Release: 1.kb.3%{?dist} +Release: 2.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -667,6 +667,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Jun 23 2009 Matthew Barnes - 2.27.3-2.kb.3.fc12 +- Rebuild to keep N-V-R ahead of Rawhide. + * Sat Jun 20 2009 Matthew Barnes - 2.27.3-1.kb.3.fc12 - Snapshot of "kill-bonobo" branch at commit ce7537b. From 48744ece34bc8f203fe847d4e1e00569b2d5d411 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 23:15:22 +0000 Subject: [PATCH 13/75] - Snapshot of "kill-bonobo" branch at commit bfc5ba2. --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5807fb4..17dddfe 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.3-kill-bonobo-ce7537b.tar.bz2 +evolution-2.27.3-kill-bonobo-bfc5ba2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index c7d8354..c8d0e89 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash ce7537b +%define hash bfc5ba2 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.3 -Release: 2.kb.1%{?dist} +Release: 2.kb.4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -667,6 +667,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Jun 30 2009 Matthew Barnes - 2.27.3-2.kb.4.fc12 +- Snapshot of "kill-bonobo" branch at commit bfc5ba2. + * Tue Jun 23 2009 Matthew Barnes - 2.27.3-2.kb.3.fc12 - Rebuild to keep N-V-R ahead of Rawhide. diff --git a/sources b/sources index 3895ab9..e48016c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fabad798175702da4c58582cd6bd42fa evolution-2.27.3-kill-bonobo-ce7537b.tar.bz2 +d237eb54aab42eb82a6abb8fe6fa529c evolution-2.27.3-kill-bonobo-bfc5ba2.tar.bz2 From c72a19e9d7b81b65d43cb24c3d34e7a1cf06d6f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Jun 2009 23:39:13 +0000 Subject: [PATCH 14/75] Fix sources. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e48016c..cb88a0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d237eb54aab42eb82a6abb8fe6fa529c evolution-2.27.3-kill-bonobo-bfc5ba2.tar.bz2 +aac98fd83ac742bb058ea8816188e396 evolution-2.27.3-kill-bonobo-bfc5ba2.tar.bz2 From 60880c66bbb676ac1f86d861a8eba68d807c85fc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 18:54:56 +0000 Subject: [PATCH 15/75] - Snapshot of "kill-bonobo" branch at commit a1082f0. --- .cvsignore | 2 +- evolution-2.26.1-attachment-bar-crasher.patch | 12 ------------ evolution.spec | 9 ++++++--- sources | 2 +- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 evolution-2.26.1-attachment-bar-crasher.patch diff --git a/.cvsignore b/.cvsignore index 17dddfe..2537b3b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.3-kill-bonobo-bfc5ba2.tar.bz2 +evolution-2.27.4-kill-bonobo-a1082f0.tar.bz2 diff --git a/evolution-2.26.1-attachment-bar-crasher.patch b/evolution-2.26.1-attachment-bar-crasher.patch deleted file mode 100644 index 4cc84d2..0000000 --- a/evolution-2.26.1-attachment-bar-crasher.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher evolution-2.26.1/widgets/misc/e-attachment-bar.c ---- evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher 2009-04-14 12:49:45.000000000 -0400 -+++ evolution-2.26.1/widgets/misc/e-attachment-bar.c 2009-04-14 12:50:54.000000000 -0400 -@@ -450,6 +450,8 @@ update (EAttachmentBar *bar) - if (desc) - desc = g_strdup (desc); - } -+ } else { -+ desc = g_strdup (desc); - } - - if (!desc) diff --git a/evolution.spec b/evolution.spec index c8d0e89..179264c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash bfc5ba2 +%define hash a1082f0 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.27.3 -Release: 2.kb.4%{?dist} +Version: 2.27.4 +Release: 1.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -667,6 +667,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Thu Jul 02 2009 Matthew Barnes - 2.27.4-1.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit a1082f0. + * Tue Jun 30 2009 Matthew Barnes - 2.27.3-2.kb.4.fc12 - Snapshot of "kill-bonobo" branch at commit bfc5ba2. diff --git a/sources b/sources index cb88a0b..fea05c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aac98fd83ac742bb058ea8816188e396 evolution-2.27.3-kill-bonobo-bfc5ba2.tar.bz2 +d42a0fa2e8c1825fcadf847b969ab618 evolution-2.27.4-kill-bonobo-a1082f0.tar.bz2 From e0f22099bfb40178fa3e2f849dc757f1aebdb96b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 19:21:25 +0000 Subject: [PATCH 16/75] - Snapshot of "kill-bonobo" branch at commit b2f2de3. --- .cvsignore | 2 +- evolution.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2537b3b..c261362 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.4-kill-bonobo-a1082f0.tar.bz2 +evolution-2.27.3-kill-bonobo-b2f2de3.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 179264c..ad09245 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash a1082f0 +%define hash b2f2de3 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.27.4 -Release: 1.kb.1%{?dist} +Version: 2.27.3 +Release: 3.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -667,8 +667,8 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog -* Thu Jul 02 2009 Matthew Barnes - 2.27.4-1.kb.1.fc12 -- Snapshot of "kill-bonobo" branch at commit a1082f0. +* Thu Jul 02 2009 Matthew Barnes - 2.27.3-3.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit b2f2de3. * Tue Jun 30 2009 Matthew Barnes - 2.27.3-2.kb.4.fc12 - Snapshot of "kill-bonobo" branch at commit bfc5ba2. diff --git a/sources b/sources index fea05c8..ba5bb9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d42a0fa2e8c1825fcadf847b969ab618 evolution-2.27.4-kill-bonobo-a1082f0.tar.bz2 +3d918d07fa6360f419b5cd614f92c41d evolution-2.27.3-kill-bonobo-b2f2de3.tar.bz2 From 7da5484a57cc664f548735d8d2b07070f0fc0432 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 21:19:30 +0000 Subject: [PATCH 17/75] Try again. --- evolution.spec | 4 ++-- sources | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index ad09245..efaf656 100644 --- a/evolution.spec +++ b/evolution.spec @@ -309,9 +309,9 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE cd po grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in -intltool-update --pot +intltool-update --gettext-package=%{name}-%{evo_major} --pot for p in *.po; do - msgmerge $p evolution-%{evo_major}.pot > $p.out + msgmerge $p %{name}-%{evo_major}.pot > $p.out msgfmt -o `basename $p .po`.gmo $p.out done cd - diff --git a/sources b/sources index ba5bb9e..9c92136 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d918d07fa6360f419b5cd614f92c41d evolution-2.27.3-kill-bonobo-b2f2de3.tar.bz2 +bc04a5368b47135951377eba5c9e545c evolution-2.27.3-kill-bonobo-b2f2de3.tar.bz2 From 2c327a9b8112dec46782b95c2a6cebe45d77d9ad Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 21:39:46 +0000 Subject: [PATCH 18/75] Fix sources. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 9c92136..faa47e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc04a5368b47135951377eba5c9e545c evolution-2.27.3-kill-bonobo-b2f2de3.tar.bz2 +acab52b736d636bdb65f1160d9c81145 evolution-2.27.3-kill-bonobo-b2f2de3.tar.bz2 From e7c22f92ad19984ac5422c1e75b8adb8a02bb4a6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 22:23:56 +0000 Subject: [PATCH 19/75] Update %files. --- evolution.spec | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/evolution.spec b/evolution.spec index efaf656..3480978 100644 --- a/evolution.spec +++ b/evolution.spec @@ -378,14 +378,14 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null -#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null -#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null -#gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null %post bogofilter @@ -408,13 +408,13 @@ rm -rf $RPM_BUILD_ROOT # GConf schemas: %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas -#%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas +%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas -#%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas -#%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas +%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas +%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas %{_sysconfdir}/gconf/schemas/evolution-mail.schemas # The main executable @@ -462,8 +462,8 @@ rm -rf $RPM_BUILD_ROOT %{_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-mail-shared.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-mail.so.* %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* #%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.* %{_libdir}/evolution/%{evo_major}/libfilter.so.* @@ -513,14 +513,14 @@ rm -rf $RPM_BUILD_ROOT #%{evo_plugin_dir}/org-gnome-calendar-weather.eplug #%{evo_plugin_dir}/liborg-gnome-calendar-weather.so -#%{evo_plugin_dir}/org-gnome-default-mailer.eplug -#%{evo_plugin_dir}/liborg-gnome-default-mailer.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-email-custom-header.eplug -#%{evo_plugin_dir}/liborg-gnome-email-custom-header.so +%{evo_plugin_dir}/org-gnome-email-custom-header.eplug +%{evo_plugin_dir}/liborg-gnome-email-custom-header.so %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so @@ -534,8 +534,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-profiler.eplug %{evo_plugin_dir}/liborg-gnome-evolution-profiler.so -#%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug -#%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so +%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so #%{evo_plugin_dir}/org-gnome-exchange-operations.eplug #%{evo_plugin_dir}/liborg-gnome-exchange-operations.so @@ -548,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-external-editor.eplug %{evo_plugin_dir}/liborg-gnome-external-editor.so +%{evo_plugin_dir}/org-gnome-face.eplug +%{evo_plugin_dir}/liborg-gnome-face.so + #%{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 @@ -568,9 +571,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-mail-notification.eplug %{evo_plugin_dir}/liborg-gnome-mail-notification.so -#%{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-mail-to-task.eplug +%{evo_plugin_dir}/liborg-gnome-mail-to-task.so %{evo_plugin_dir}/org-gnome-mark-all-read.eplug %{evo_plugin_dir}/liborg-gnome-mark-all-read.so @@ -578,8 +580,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-plugin-manager.eplug %{evo_plugin_dir}/liborg-gnome-plugin-manager.so -#%{evo_plugin_dir}/org-gnome-prefer-plain.eplug -#%{evo_plugin_dir}/liborg-gnome-prefer-plain.so +%{evo_plugin_dir}/org-gnome-prefer-plain.eplug +%{evo_plugin_dir}/liborg-gnome-prefer-plain.so #%{evo_plugin_dir}/org-gnome-publish-calendar.eplug #%{evo_plugin_dir}/liborg-gnome-publish-calendar.so @@ -591,9 +593,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so -#%{evo_plugin_dir}/templates.glade -#%{evo_plugin_dir}/org-gnome-templates.eplug -#%{evo_plugin_dir}/liborg-gnome-templates.so +%{evo_plugin_dir}/templates.glade +%{evo_plugin_dir}/org-gnome-templates.eplug +%{evo_plugin_dir}/liborg-gnome-templates.so %{evo_plugin_dir}/org-gnome-vcard-inline.eplug %{evo_plugin_dir}/liborg-gnome-vcard-inline.so @@ -624,8 +626,8 @@ rm -rf $RPM_BUILD_ROOT %{_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-mail-shared.so +%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so +%{_libdir}/evolution/%{evo_major}/libevolution-mail.so %{_libdir}/evolution/%{evo_major}/libevolution-smime.so #%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so %{_libdir}/evolution/%{evo_major}/libfilter.so From 2fb95f26532d80f7ff380fe0d4f7a9340cbe5d1d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Jul 2009 18:28:40 +0000 Subject: [PATCH 20/75] - Snapshot of "kill-bonobo" branch at commit 6d9e836. --- .cvsignore | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c261362..26a93b4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.3-kill-bonobo-b2f2de3.tar.bz2 +evolution-2.27.4-kill-bonobo-6d9e836.tar.gz diff --git a/evolution.spec b/evolution.spec index 3480978..43fd54c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash b2f2de3 +%define hash 6d9e836 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.27.3 -Release: 3.kb.1%{?dist} +Version: 2.27.4 +Release: 1.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -669,6 +669,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Jul 14 2009 Matthew Barnes - 2.27.4-1.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit 6d9e836. + * Thu Jul 02 2009 Matthew Barnes - 2.27.3-3.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit b2f2de3. diff --git a/sources b/sources index faa47e1..e6684c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acab52b736d636bdb65f1160d9c81145 evolution-2.27.3-kill-bonobo-b2f2de3.tar.bz2 +4f6ef891c37e619cc8f4ebbd325d94c7 evolution-2.27.4-kill-bonobo-6d9e836.tar.gz From be6f9ddb2e17b12684a33c63a114ff984f1412de Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Jul 2009 18:47:11 +0000 Subject: [PATCH 21/75] Fix sources. --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 26a93b4..ea10451 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.4-kill-bonobo-6d9e836.tar.gz +evolution-2.27.4-kill-bonobo-6d9e836.tar.bz2 diff --git a/sources b/sources index e6684c8..c4e2574 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f6ef891c37e619cc8f4ebbd325d94c7 evolution-2.27.4-kill-bonobo-6d9e836.tar.gz +08c8cab2dbc6ac591ce8f9bf0d10b208 evolution-2.27.4-kill-bonobo-6d9e836.tar.bz2 From a836ab7eb1deac20918989f7daa4e176e1f2d987 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Jul 2009 19:26:38 +0000 Subject: [PATCH 22/75] Fix file list. --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 43fd54c..b004077 100644 --- a/evolution.spec +++ b/evolution.spec @@ -450,6 +450,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libeconduit.so.* %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* %{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.* +%{_libdir}/evolution/%{evo_major}/libemformat.so.* %{_libdir}/evolution/%{evo_major}/libemiscwidgets.so.* %{_libdir}/evolution/%{evo_major}/libeshell.so.* %{_libdir}/evolution/%{evo_major}/libessmime.so.* @@ -608,17 +609,18 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/eshell %{_includedir}/evolution-%{evo_major} %{_libdir}/pkgconfig/evolution-plugin.pc -%{_libdir}/pkgconfig/evolution-shell.pc +#%{_libdir}/evolution/%{evo_major}/libefilterbar.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}/libemformat.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}/pkgconfig/evolution-shell.pc %{_libdir}/evolution/%{evo_major}/libetimezonedialog.so %{_libdir}/evolution/%{evo_major}/libeutil.so %{_libdir}/evolution/%{evo_major}/libevolution-a11y.so From c5c7498b2a36c2e8bc4930b286d912649f8794cf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 15 Jul 2009 19:29:45 +0000 Subject: [PATCH 23/75] - Snapshot of "kill-bonobo" branch at commit 80f8519. --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index ea10451..6d09218 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.4-kill-bonobo-6d9e836.tar.bz2 +evolution-2.27.4-kill-bonobo-80f8519.tar.bz2 diff --git a/evolution.spec b/evolution.spec index b004077..791f268 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 6d9e836 +%define hash 80f8519 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.4 -Release: 1.kb.1%{?dist} +Release: 1.kb.2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -671,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Wed Jul 15 2009 Matthew Barnes - 2.27.4-1.kb.2.fc12 +- Snapshot of "kill-bonobo" branch at commit 80f8519. + * Tue Jul 14 2009 Matthew Barnes - 2.27.4-1.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit 6d9e836. diff --git a/sources b/sources index c4e2574..20ead29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08c8cab2dbc6ac591ce8f9bf0d10b208 evolution-2.27.4-kill-bonobo-6d9e836.tar.bz2 +de388d45bc39e70de0f500e2f2f40f9d evolution-2.27.4-kill-bonobo-80f8519.tar.bz2 From 35daee9fe5fe7243bb247829d33864e057bdc8c6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 17 Jul 2009 23:09:41 +0000 Subject: [PATCH 24/75] - Snapshot of "kill-bonobo" branch at commit becd78e. --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6d09218..08830fa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.4-kill-bonobo-80f8519.tar.bz2 +evolution-2.27.4-kill-bonobo-becd78e.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 791f268..84b08a5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 80f8519 +%define hash becd78e %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.4 -Release: 1.kb.2%{?dist} +Release: 1.kb.3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -671,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Fri Jul 17 2009 Matthew Barnes - 2.27.4-1.kb.3.fc12 +- Snapshot of "kill-bonobo" branch at commit becd78e. + * Wed Jul 15 2009 Matthew Barnes - 2.27.4-1.kb.2.fc12 - Snapshot of "kill-bonobo" branch at commit 80f8519. diff --git a/sources b/sources index 20ead29..291c5e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de388d45bc39e70de0f500e2f2f40f9d evolution-2.27.4-kill-bonobo-80f8519.tar.bz2 +f2b291d4c97dc7ec577f25a0e5024d2f evolution-2.27.4-kill-bonobo-becd78e.tar.bz2 From f77650fb0b6087852aa6871e261af34d3ebe7fe2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Jul 2009 15:42:57 +0000 Subject: [PATCH 25/75] - Snapshot of "kill-bonobo" branch at commit 2c4510e. --- .cvsignore | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 08830fa..57a72d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.4-kill-bonobo-becd78e.tar.bz2 +evolution-kill-bonobo-2c4510e.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 84b08a5..ea43137 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash becd78e +%define hash 2c4510e %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.27.4 -Release: 1.kb.3%{?dist} +Version: 2.27.5 +Release: 1.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -671,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Jul 28 2009 Matthew Barnes - 2.27.5-1.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit 2c4510e. + * Fri Jul 17 2009 Matthew Barnes - 2.27.4-1.kb.3.fc12 - Snapshot of "kill-bonobo" branch at commit becd78e. diff --git a/sources b/sources index 291c5e9..2657f13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f2b291d4c97dc7ec577f25a0e5024d2f evolution-2.27.4-kill-bonobo-becd78e.tar.bz2 +26a5fd8aaf48812b2120b7d856af92ed evolution-kill-bonobo-2c4510e.tar.bz2 From 14c59c965f497ddc68fbef5b62e0d6f6afa2dcc9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Jul 2009 16:19:05 +0000 Subject: [PATCH 26/75] Fix sources. --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 57a72d9..3778d09 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-kill-bonobo-2c4510e.tar.bz2 +evolution-2.27.5-kill-bonobo-2c4510e.tar.bz2 diff --git a/sources b/sources index 2657f13..525daf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26a5fd8aaf48812b2120b7d856af92ed evolution-kill-bonobo-2c4510e.tar.bz2 +26a5fd8aaf48812b2120b7d856af92ed evolution-2.27.5-kill-bonobo-2c4510e.tar.bz2 From f519be1cbc486ced6899a5265a60e69ea703a5d5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 31 Jul 2009 19:38:34 +0000 Subject: [PATCH 27/75] - Rebuild to keep N-V-R ahead of Rawhide. --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index ea43137..f25db5c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.5 -Release: 1.kb.1%{?dist} +Release: 3.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -671,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Fri Jul 31 2009 Matthew Barnes - 2.27.5-3.kb.1.fc12 +- Rebuild to keep N-V-R ahead of Rawhide. + * Tue Jul 28 2009 Matthew Barnes - 2.27.5-1.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit 2c4510e. From d71c40bfbe2a60d73fa612437faac371b9c76615 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Aug 2009 02:08:38 +0000 Subject: [PATCH 28/75] - Snapshot of "kill-bonobo" branch at commit 26072c8. --- .cvsignore | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3778d09..787857b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.5-kill-bonobo-2c4510e.tar.bz2 +evolution-2.27.90-kill-bonobo-26072c8.tar.bz2 diff --git a/evolution.spec b/evolution.spec index f25db5c..9d1c112 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 2c4510e +%define hash 26072c8 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.27.5 -Release: 3.kb.1%{?dist} +Version: 2.27.90 +Release: 2.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -671,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Aug 11 2009 Matthew Barnes - 2.27.90-2.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit 26072c8. + * Fri Jul 31 2009 Matthew Barnes - 2.27.5-3.kb.1.fc12 - Rebuild to keep N-V-R ahead of Rawhide. diff --git a/sources b/sources index 525daf1..a8330d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -26a5fd8aaf48812b2120b7d856af92ed evolution-2.27.5-kill-bonobo-2c4510e.tar.bz2 +8713138264a2a82b8a749ebb26ba2f06 evolution-2.27.90-kill-bonobo-26072c8.tar.bz2 From d926e7f5c06ae631ddf741290884a56a97221c11 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Aug 2009 03:16:48 +0000 Subject: [PATCH 29/75] - Snapshot of "kill-bonobo" branch at commit 26072c8. --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 9d1c112..e794e4c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,6 +4,7 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 %define glib2_version 2.16.0 +%define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 @@ -99,6 +100,7 @@ BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common +BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gnutls-devel BuildRequires: gtk-doc From 60277c93e12f1078d91da5ef6f8339b1806135ea Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Aug 2009 10:37:43 +0000 Subject: [PATCH 30/75] Fix files list. --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index e794e4c..4aaeec5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -463,6 +463,7 @@ rm -rf $RPM_BUILD_ROOT %{_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.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.* @@ -628,6 +629,7 @@ rm -rf $RPM_BUILD_ROOT %{_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.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 From 73da6a163c4f8258fb7020e55702e65fd96c58b1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 18 Aug 2009 19:01:04 +0000 Subject: [PATCH 31/75] - Snapshot of "kill-bonobo" branch at commit 0cc0035. --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 787857b..1373d4e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.90-kill-bonobo-26072c8.tar.bz2 +evolution-2.27.90-kill-bonobo-0cc0035.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 4aaeec5..8e2b440 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 26072c8 +%define hash 0cc0035 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -46,7 +46,7 @@ Name: evolution Version: 2.27.90 -Release: 2.kb.1%{?dist} +Release: 3.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -675,6 +675,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Aug 18 2009 Matthew Barnes - 2.27.90-3.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit 0cc0035. + * Tue Aug 11 2009 Matthew Barnes - 2.27.90-2.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit 26072c8. diff --git a/sources b/sources index a8330d6..1b30bd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8713138264a2a82b8a749ebb26ba2f06 evolution-2.27.90-kill-bonobo-26072c8.tar.bz2 +8354380b462d71b8c28a937a74588e18 evolution-2.27.90-kill-bonobo-0cc0035.tar.bz2 From b85705a779cd4b6d948068ebfc695f29d578c861 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 18 Aug 2009 19:31:49 +0000 Subject: [PATCH 32/75] Fix files list. --- evolution.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8e2b440..9feabce 100644 --- a/evolution.spec +++ b/evolution.spec @@ -501,9 +501,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-audio-inline.so %endif -#%{evo_plugin_dir}/org-gnome-backup-restore.eplug -#%{evo_plugin_dir}/org-gnome-backup-restore.xml -#%{evo_plugin_dir}/liborg-gnome-backup-restore.so +%{evo_plugin_dir}/org-gnome-backup-restore.eplug +%{evo_plugin_dir}/org-gnome-backup-restore.xml +%{evo_plugin_dir}/liborg-gnome-backup-restore.so %{evo_plugin_dir}/org-gnome-evolution-caldav.eplug %{evo_plugin_dir}/liborg-gnome-evolution-caldav.so @@ -514,8 +514,8 @@ rm -rf $RPM_BUILD_ROOT %{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-calendar-weather.eplug +%{evo_plugin_dir}/liborg-gnome-calendar-weather.so %{evo_plugin_dir}/org-gnome-default-mailer.eplug %{evo_plugin_dir}/liborg-gnome-default-mailer.so @@ -565,8 +565,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so -#%{evo_plugin_dir}/org-gnome-itip-formatter.eplug -#%{evo_plugin_dir}/liborg-gnome-itip-formatter.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 From be71d5d5417e98903af64d53628b045fd4f0c638 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 19 Aug 2009 01:57:17 +0000 Subject: [PATCH 33/75] Fix file list, again. --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 9feabce..3df5df7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -502,7 +502,6 @@ rm -rf $RPM_BUILD_ROOT %endif %{evo_plugin_dir}/org-gnome-backup-restore.eplug -%{evo_plugin_dir}/org-gnome-backup-restore.xml %{evo_plugin_dir}/liborg-gnome-backup-restore.so %{evo_plugin_dir}/org-gnome-evolution-caldav.eplug From 654f1a451a6c325879a337c47a265663b53de9c4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 19 Aug 2009 02:44:45 +0000 Subject: [PATCH 34/75] Try again... --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 3df5df7..46cf84c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -478,7 +478,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/evolution/%{evo_major} %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export %{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify -#%{_libexecdir}/evolution/%{evo_major}/evolution-backup +%{_libexecdir}/evolution/%{evo_major}/evolution-backup %{_libexecdir}/evolution/%{evo_major}/killev # The plugin directory: From e4998b53ac869408e383a0a44b20cac26ff6a225 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 24 Aug 2009 04:16:49 +0000 Subject: [PATCH 35/75] - Snapshot of "kill-bonobo" branch at commit 94c361b. --- .cvsignore | 2 +- evolution.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1373d4e..11260c2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.90-kill-bonobo-0cc0035.tar.bz2 +evolution-2.27.91-kill-bonobo-94c361b.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 46cf84c..9b1a8d8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 0cc0035 +%define hash 94c361b %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.27.90 -Release: 3.kb.1%{?dist} +Version: 2.27.91 +Release: 1.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -590,8 +590,8 @@ rm -rf $RPM_BUILD_ROOT #%{evo_plugin_dir}/liborg-gnome-publish-calendar.so #%{evo_plugin_dir}/org-gnome-publish-calendar.xml -%{evo_plugin_dir}/org-gnome-save-calendar.eplug -%{evo_plugin_dir}/liborg-gnome-save-calendar.so +#%{evo_plugin_dir}/org-gnome-save-calendar.eplug +#%{evo_plugin_dir}/liborg-gnome-save-calendar.so %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so @@ -674,6 +674,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Sun Aug 23 2009 Matthew Barnes - 2.27.91-1.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit 94c361b. + * Tue Aug 18 2009 Matthew Barnes - 2.27.90-3.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit 0cc0035. diff --git a/sources b/sources index 1b30bd5..c43b211 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8354380b462d71b8c28a937a74588e18 evolution-2.27.90-kill-bonobo-0cc0035.tar.bz2 +950e447ca2cb899275671669d9f565f8 evolution-2.27.91-kill-bonobo-94c361b.tar.bz2 From 010f0eb395c6a60e2262ac0799bc778d47ffe7ac Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 24 Aug 2009 20:09:14 +0000 Subject: [PATCH 36/75] Add new BR. --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 9b1a8d8..624479a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -110,6 +110,7 @@ BuildRequires: gvfs BuildRequires: intltool >= %{intltool_version} BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version} +BuildRequires: libcanberra-devel BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libgweather-devel >= %{libgweather_version} From 0a4cc7d0db52396fc60e66ecbe28ca15b497e4f4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 27 Aug 2009 23:23:20 +0000 Subject: [PATCH 37/75] - Snapshot of "kill-bonobo" branch at commit 787ce81. --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 11260c2..57fe56f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.91-kill-bonobo-94c361b.tar.bz2 +evolution-2.27.91-kill-bonobo-787ce81.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 624479a..74d0c73 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 94c361b +%define hash 787ce81 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -46,7 +46,7 @@ Name: evolution Version: 2.27.91 -Release: 1.kb.1%{?dist} +Release: 1.kb.2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -675,6 +675,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Thu Aug 27 2009 Matthew Barnes - 2.27.91-1.kb.2.fc12 +- Snapshot of "kill-bonobo" branch at commit 787ce81. + * Sun Aug 23 2009 Matthew Barnes - 2.27.91-1.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit 94c361b. diff --git a/sources b/sources index c43b211..34bafe6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -950e447ca2cb899275671669d9f565f8 evolution-2.27.91-kill-bonobo-94c361b.tar.bz2 +de28e832eb2975ee0cf40ed7690d4fe6 evolution-2.27.91-kill-bonobo-787ce81.tar.bz2 From 751b9447904702c4667fc16d43d15abbc933e42d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 31 Aug 2009 23:11:01 +0000 Subject: [PATCH 38/75] - Snapshot of "kill-bonobo" branch at commit e7a7e7d. - Relax the evolution-data-server version requirement. --- .cvsignore | 2 +- evolution-override-eds-version.patch | 37 ++++++++++++++++++++++++++++ evolution.spec | 17 ++++++++++--- sources | 2 +- 4 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 evolution-override-eds-version.patch diff --git a/.cvsignore b/.cvsignore index 57fe56f..f114c30 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.91-kill-bonobo-787ce81.tar.bz2 +evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2 diff --git a/evolution-override-eds-version.patch b/evolution-override-eds-version.patch new file mode 100644 index 0000000..cc46aa9 --- /dev/null +++ b/evolution-override-eds-version.patch @@ -0,0 +1,37 @@ +diff -up evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac +--- evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version 2009-08-31 19:07:26.848150729 -0400 ++++ evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac 2009-08-31 19:08:12.281366667 -0400 +@@ -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]) ++dnl m4_define([eds_minimum_version], [evo_version]) + m4_define([gnome_icon_theme_minimum_version], [2.19.91]) + m4_define([gnome_desktop_minimum_version], [2.26.0]) + m4_define([libbonobo_minimum_version], [2.20.3]) +@@ -248,15 +248,15 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], + AC_SUBST(GNOME_PLATFORM_CFLAGS) + AC_SUBST(GNOME_PLATFORM_LIBS) + +-PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], +- [libebook-$EDS_PACKAGE >= eds_minimum_version +- libecal-$EDS_PACKAGE >= eds_minimum_version +- libedataserver-$EDS_PACKAGE >= eds_minimum_version +- libedataserverui-$EDS_PACKAGE >= eds_minimum_version +- libegroupwise-$EDS_PACKAGE >= eds_minimum_version +- libebackend-$EDS_PACKAGE >= eds_minimum_version +- libgdata-$EDS_PACKAGE >= eds_minimum_version +- libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) ++dnl PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], ++dnl [libebook-$EDS_PACKAGE >= eds_minimum_version ++dnl libecal-$EDS_PACKAGE >= eds_minimum_version ++dnl libedataserver-$EDS_PACKAGE >= eds_minimum_version ++dnl libedataserverui-$EDS_PACKAGE >= eds_minimum_version ++dnl libegroupwise-$EDS_PACKAGE >= eds_minimum_version ++dnl libebackend-$EDS_PACKAGE >= eds_minimum_version ++dnl libgdata-$EDS_PACKAGE >= eds_minimum_version ++dnl libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) + + dnl ****************************** + dnl Canberra / Canberra-GTK Sound diff --git a/evolution.spec b/evolution.spec index 74d0c73..01c0939 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 787ce81 +%define hash e7a7e7d %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.27.91 -Release: 1.kb.2%{?dist} +Version: 2.29.1 +Release: 1.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -69,6 +69,10 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# Override the evolution-data-server version requirement, +# since e-d-s version 2.29 will never exist in Fedora 12. +Patch13: evolution-override-eds-version.patch + ## Dependencies ### Requires(post): GConf2 @@ -95,7 +99,7 @@ BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{version} +BuildRequires: evolution-data-server-devel BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} @@ -229,6 +233,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .override-eds-version mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -675,6 +680,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Aug 31 2009 Matthew Barnes - 2.29.1-1.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit e7a7e7d. +- Relax the evolution-data-server version requirement. + * Thu Aug 27 2009 Matthew Barnes - 2.27.91-1.kb.2.fc12 - Snapshot of "kill-bonobo" branch at commit 787ce81. diff --git a/sources b/sources index 34bafe6..2e844fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de28e832eb2975ee0cf40ed7690d4fe6 evolution-2.27.91-kill-bonobo-787ce81.tar.bz2 +e838844dc46e59e95c37719fd95bbdb2 evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2 From 955e157d65886bedb5491fc7e777a022bb34aee2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 31 Aug 2009 23:48:21 +0000 Subject: [PATCH 39/75] Bump evo_major. --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 01c0939..543183d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -20,7 +20,7 @@ %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.28 +%define evo_major 2.30 %define exchange_support 1 %define inline_audio_support 1 @@ -683,6 +683,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Aug 31 2009 Matthew Barnes - 2.29.1-1.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit e7a7e7d. - Relax the evolution-data-server version requirement. +- Bump evo_major to 2.30. * Thu Aug 27 2009 Matthew Barnes - 2.27.91-1.kb.2.fc12 - Snapshot of "kill-bonobo" branch at commit 787ce81. From 46d9bf94a7687bd13bb30e217212f3004b8c6c6a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 Sep 2009 19:06:40 +0000 Subject: [PATCH 40/75] - Snapshot of "kill-bonobo" branch at commit f945e64. - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier compatibility with Fedora 12. --- .cvsignore | 2 +- evolution-kb-override-version.patch | 24 ++++++++++++++++++ evolution-override-eds-version.patch | 37 ---------------------------- evolution.spec | 23 +++++++++-------- sources | 2 +- 5 files changed, 37 insertions(+), 51 deletions(-) create mode 100644 evolution-kb-override-version.patch delete mode 100644 evolution-override-eds-version.patch diff --git a/.cvsignore b/.cvsignore index f114c30..360e44e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2 +evolution-2.29.1-kill-bonobo-f945e64.tar.bz2 diff --git a/evolution-kb-override-version.patch b/evolution-kb-override-version.patch new file mode 100644 index 0000000..104f02f --- /dev/null +++ b/evolution-kb-override-version.patch @@ -0,0 +1,24 @@ +diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evolution-2.29.1-kill-bonobo-f945e64/configure.ac +--- evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version 2009-09-01 15:02:53.028656991 -0400 ++++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac 2009-09-01 15:03:19.843363079 -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], [1]) ++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. diff --git a/evolution-override-eds-version.patch b/evolution-override-eds-version.patch deleted file mode 100644 index cc46aa9..0000000 --- a/evolution-override-eds-version.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac ---- evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac.override-eds-version 2009-08-31 19:07:26.848150729 -0400 -+++ evolution-2.29.1-kill-bonobo-e7a7e7d/configure.ac 2009-08-31 19:08:12.281366667 -0400 -@@ -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]) -+dnl m4_define([eds_minimum_version], [evo_version]) - m4_define([gnome_icon_theme_minimum_version], [2.19.91]) - m4_define([gnome_desktop_minimum_version], [2.26.0]) - m4_define([libbonobo_minimum_version], [2.20.3]) -@@ -248,15 +248,15 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], - AC_SUBST(GNOME_PLATFORM_CFLAGS) - AC_SUBST(GNOME_PLATFORM_LIBS) - --PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], -- [libebook-$EDS_PACKAGE >= eds_minimum_version -- libecal-$EDS_PACKAGE >= eds_minimum_version -- libedataserver-$EDS_PACKAGE >= eds_minimum_version -- libedataserverui-$EDS_PACKAGE >= eds_minimum_version -- libegroupwise-$EDS_PACKAGE >= eds_minimum_version -- libebackend-$EDS_PACKAGE >= eds_minimum_version -- libgdata-$EDS_PACKAGE >= eds_minimum_version -- libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) -+dnl PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], -+dnl [libebook-$EDS_PACKAGE >= eds_minimum_version -+dnl libecal-$EDS_PACKAGE >= eds_minimum_version -+dnl libedataserver-$EDS_PACKAGE >= eds_minimum_version -+dnl libedataserverui-$EDS_PACKAGE >= eds_minimum_version -+dnl libegroupwise-$EDS_PACKAGE >= eds_minimum_version -+dnl libebackend-$EDS_PACKAGE >= eds_minimum_version -+dnl libgdata-$EDS_PACKAGE >= eds_minimum_version -+dnl libgdata-google-$EDS_PACKAGE >= eds_minimum_version]) - - dnl ****************************** - dnl Canberra / Canberra-GTK Sound diff --git a/evolution.spec b/evolution.spec index 543183d..781d62b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash e7a7e7d +%define hash f945e64 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,14 +45,14 @@ ### Abstract ### Name: evolution -Version: 2.29.1 +Version: 2.27.99 Release: 1.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: %{name}-%{version}-kill-bonobo-%{hash}.tar.bz2 +Source: %{name}-2.29.1-kill-bonobo-%{hash}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -69,9 +69,8 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Override the evolution-data-server version requirement, -# since e-d-s version 2.29 will never exist in Fedora 12. -Patch13: evolution-override-eds-version.patch +# Override the version to 2.27.99 (and API_VERSION to 2.28). +Patch13: evolution-kb-override-version.patch ## Dependencies ### @@ -229,11 +228,11 @@ Requires: %{name} = %{version}-%{release} This package contains supplemental utilities for %{name} that require Perl. %prep -%setup -q -n evolution-%{version}-kill-bonobo-%{hash} +%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .override-eds-version +%patch13 -p1 -b .override-version mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -680,10 +679,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog -* Mon Aug 31 2009 Matthew Barnes - 2.29.1-1.kb.1.fc12 -- Snapshot of "kill-bonobo" branch at commit e7a7e7d. -- Relax the evolution-data-server version requirement. -- Bump evo_major to 2.30. +* Mon Sep 01 2009 Matthew Barnes - 2.27.99-1.kb.1.fc12 +- Snapshot of "kill-bonobo" branch at commit f945e64. +- Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier + compatibility with Fedora 12. * Thu Aug 27 2009 Matthew Barnes - 2.27.91-1.kb.2.fc12 - Snapshot of "kill-bonobo" branch at commit 787ce81. diff --git a/sources b/sources index 2e844fb..dd9d0ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e838844dc46e59e95c37719fd95bbdb2 evolution-2.29.1-kill-bonobo-e7a7e7d.tar.bz2 +658fce6142a8c152cde3054c1086a849 evolution-2.29.1-kill-bonobo-f945e64.tar.bz2 From 4c713582959501f0e427da9cab142244ab6a8053 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 Sep 2009 19:38:01 +0000 Subject: [PATCH 41/75] - Snapshot of "kill-bonobo" branch at commit f945e64. - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier compatibility with Fedora 12. - Relax evolution-data-server requirement. --- evolution-kb-override-version.patch | 11 ++++++++++- evolution.spec | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/evolution-kb-override-version.patch b/evolution-kb-override-version.patch index 104f02f..f20bce2 100644 --- a/evolution-kb-override-version.patch +++ b/evolution-kb-override-version.patch @@ -1,6 +1,6 @@ diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evolution-2.29.1-kill-bonobo-f945e64/configure.ac --- evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version 2009-09-01 15:02:53.028656991 -0400 -+++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac 2009-09-01 15:03:19.843363079 -0400 ++++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac 2009-09-01 15:36:41.818612634 -0400 @@ -1,7 +1,7 @@ dnl Evolution Versions m4_define([evo_major_version], [2]) @@ -22,3 +22,12 @@ diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evol 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.91]) + m4_define([gnome_icon_theme_minimum_version], [2.19.91]) + m4_define([gnome_desktop_minimum_version], [2.26.0]) + m4_define([libbonobo_minimum_version], [2.20.3]) diff --git a/evolution.spec b/evolution.spec index 781d62b..8b47ee7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -3,6 +3,7 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 +%define eds_version 2.27.91 %define glib2_version 2.16.0 %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 @@ -98,7 +99,7 @@ BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel +BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} @@ -683,6 +684,7 @@ rm -rf $RPM_BUILD_ROOT - Snapshot of "kill-bonobo" branch at commit f945e64. - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier compatibility with Fedora 12. +- Relax evolution-data-server requirement. * Thu Aug 27 2009 Matthew Barnes - 2.27.91-1.kb.2.fc12 - Snapshot of "kill-bonobo" branch at commit 787ce81. From 183d762a4d243fa1a9ef63f4a363935b879f59a3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 Sep 2009 23:56:59 +0000 Subject: [PATCH 42/75] Fix evo_major. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 8b47ee7..0cc6bad 100644 --- a/evolution.spec +++ b/evolution.spec @@ -21,7 +21,7 @@ %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.30 +%define evo_major 2.28 %define exchange_support 1 %define inline_audio_support 1 From 039e23b5d66dc572f87df4ce5bee346b92fca480 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 3 Sep 2009 02:31:29 +0000 Subject: [PATCH 43/75] - Snapshot of "kill-bonobo" branch at commit 74457fd. --- .cvsignore | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 360e44e..5a734dc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-f945e64.tar.bz2 +evolution-2.29.1-kill-bonobo-74457fd.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 0cc6bad..ebbae18 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash f945e64 +%define hash 74457fd %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -47,7 +47,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.1%{?dist} +Release: 1.kb.2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -680,7 +680,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog -* Mon Sep 01 2009 Matthew Barnes - 2.27.99-1.kb.1.fc12 +* Wed Sep 02 2009 Matthew Barnes - 2.27.99-1.kb.2.fc12 +- Snapshot of "kill-bonobo" branch at commit 74457fd. + +* Tue Sep 01 2009 Matthew Barnes - 2.27.99-1.kb.1.fc12 - Snapshot of "kill-bonobo" branch at commit f945e64. - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier compatibility with Fedora 12. diff --git a/sources b/sources index dd9d0ee..ae1d2b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -658fce6142a8c152cde3054c1086a849 evolution-2.29.1-kill-bonobo-f945e64.tar.bz2 +430d4e5ead977fa1e270a106a70caaf2 evolution-2.29.1-kill-bonobo-74457fd.tar.bz2 From ea9b24efa769388bf41dbeeba164457f3c186124 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 3 Sep 2009 03:08:20 +0000 Subject: [PATCH 44/75] Fix file list. --- evolution.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index ebbae18..22ccf9c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -592,9 +592,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-prefer-plain.eplug %{evo_plugin_dir}/liborg-gnome-prefer-plain.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}/org-gnome-publish-calendar.eplug +%{evo_plugin_dir}/liborg-gnome-publish-calendar.so #%{evo_plugin_dir}/org-gnome-save-calendar.eplug #%{evo_plugin_dir}/liborg-gnome-save-calendar.so From fd4ed33b62c24021da49d48e28e2a364abdc9f85 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 4 Sep 2009 21:58:05 +0000 Subject: [PATCH 45/75] - Snapshot of "kill-bonobo" progress at commit 35929a3. --- .cvsignore | 2 +- evolution.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5a734dc..ae9c669 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-74457fd.tar.bz2 +evolution-2.29.1-kill-bonobo-35929a3.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 22ccf9c..7df6dfb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 74457fd +%define hash 35929a3 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -47,7 +47,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.2%{?dist} +Release: 1.kb.3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -679,11 +679,14 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Fri Sep 04 2009 Matthew Barnes - 2.27.99-1.kb.3.fc12 +- Snapshot of "kill-bonobo" progress at commit 35929a3. + * Wed Sep 02 2009 Matthew Barnes - 2.27.99-1.kb.2.fc12 -- Snapshot of "kill-bonobo" branch at commit 74457fd. +- Snapshot of "kill-bonobo" progress at commit 74457fd. * Tue Sep 01 2009 Matthew Barnes - 2.27.99-1.kb.1.fc12 -- Snapshot of "kill-bonobo" branch at commit f945e64. +- Snapshot of "kill-bonobo" progress at commit f945e64. - Actual tarball is now 2.29.1, but keep the package at 2.27.99 for easier compatibility with Fedora 12. - Relax evolution-data-server requirement. diff --git a/sources b/sources index ae1d2b7..268cd01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -430d4e5ead977fa1e270a106a70caaf2 evolution-2.29.1-kill-bonobo-74457fd.tar.bz2 +0bf1036d94b9d4c92f188aa766cf344d evolution-2.29.1-kill-bonobo-35929a3.tar.bz2 From 6671174a003f5cd55bc2a09d82885488ba47e922 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 4 Sep 2009 22:44:49 +0000 Subject: [PATCH 46/75] Fix file list. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7df6dfb..142fe87 100644 --- a/evolution.spec +++ b/evolution.spec @@ -595,8 +595,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-publish-calendar.eplug %{evo_plugin_dir}/liborg-gnome-publish-calendar.so -#%{evo_plugin_dir}/org-gnome-save-calendar.eplug -#%{evo_plugin_dir}/liborg-gnome-save-calendar.so +%{evo_plugin_dir}/org-gnome-save-calendar.eplug +%{evo_plugin_dir}/liborg-gnome-save-calendar.so %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so From b12b85b9ddafdd9b54176506cec0d977c460c81b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 8 Sep 2009 03:20:31 +0000 Subject: [PATCH 47/75] - Further lower the minimum evolution-data-server version. --- evolution-kb-override-version.patch | 2 +- evolution.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution-kb-override-version.patch b/evolution-kb-override-version.patch index f20bce2..321a2a7 100644 --- a/evolution-kb-override-version.patch +++ b/evolution-kb-override-version.patch @@ -27,7 +27,7 @@ diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evol 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.91]) ++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([libbonobo_minimum_version], [2.20.3]) diff --git a/evolution.spec b/evolution.spec index 142fe87..cd049b5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -3,7 +3,7 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.27.91 +%define eds_version 2.27.1 %define glib2_version 2.16.0 %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 @@ -47,7 +47,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.3%{?dist} +Release: 1.kb.4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -679,6 +679,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Sep 07 2009 Matthew Barnes - 2.27.99-1.kb.4.fc12 +- Further lower the minimum evolution-data-server version. + * Fri Sep 04 2009 Matthew Barnes - 2.27.99-1.kb.3.fc12 - Snapshot of "kill-bonobo" progress at commit 35929a3. From becb2643ed782afeea2884625309c03516efb0c0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 9 Sep 2009 02:33:17 +0000 Subject: [PATCH 48/75] - Snapshot of "kill-bonobo" progress at commit 0a47d87. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index cd049b5..aaecb2c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 35929a3 +%define hash 0a47d87 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -47,7 +47,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.4%{?dist} +Release: 1.kb.5%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -483,7 +483,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/evolution %dir %{_libexecdir}/evolution/%{evo_major} %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export -%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify +#%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify %{_libexecdir}/evolution/%{evo_major}/evolution-backup %{_libexecdir}/evolution/%{evo_major}/killev @@ -679,6 +679,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Sep 08 2009 Matthew Barnes - 2.27.99-1.kb.5.fc12 +- Snapshot of "kill-bonobo" progress at commit 0a47d87. + * Mon Sep 07 2009 Matthew Barnes - 2.27.99-1.kb.4.fc12 - Further lower the minimum evolution-data-server version. From b3cfbdf08f89888d418755037afd2c9130feccdf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 9 Sep 2009 02:44:27 +0000 Subject: [PATCH 49/75] Forgot to upload the tarball again... --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index ae9c669..e33a48b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-35929a3.tar.bz2 +evolution-2.29.1-kill-bonobo-0a47d87.tar.bz2 diff --git a/sources b/sources index 268cd01..c29cc22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0bf1036d94b9d4c92f188aa766cf344d evolution-2.29.1-kill-bonobo-35929a3.tar.bz2 +84efc5b17b678292d07b8da65f97122f evolution-2.29.1-kill-bonobo-0a47d87.tar.bz2 From 64cdfa521928f173fd29fa211cf916d5062e0ed7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 9 Sep 2009 02:54:29 +0000 Subject: [PATCH 50/75] Fix version override patch. --- evolution-kb-override-version.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evolution-kb-override-version.patch b/evolution-kb-override-version.patch index 321a2a7..ce5c1d3 100644 --- a/evolution-kb-override-version.patch +++ b/evolution-kb-override-version.patch @@ -1,6 +1,6 @@ -diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evolution-2.29.1-kill-bonobo-f945e64/configure.ac ---- evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version 2009-09-01 15:02:53.028656991 -0400 -+++ evolution-2.29.1-kill-bonobo-f945e64/configure.ac 2009-09-01 15:36:41.818612634 -0400 +diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.1-kill-bonobo-0a47d87/configure.ac +--- evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version 2009-09-08 19:41:23.000000000 -0400 ++++ evolution-2.29.1-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]) @@ -30,4 +30,4 @@ diff -up evolution-2.29.1-kill-bonobo-f945e64/configure.ac.override-version evol +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([libbonobo_minimum_version], [2.20.3]) + m4_define([libgtkhtml_minimum_version], [3.27.90]) From 0d515144530fc581ce8d4bcb85dd4bcaa071c8de Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 9 Sep 2009 03:26:03 +0000 Subject: [PATCH 51/75] No more .server files. --- evolution.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/evolution.spec b/evolution.spec index aaecb2c..9c82374 100644 --- a/evolution.spec +++ b/evolution.spec @@ -315,7 +315,7 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. cd po -grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep +grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in intltool-update --gettext-package=%{name}-%{evo_major} --pot for p in *.po; do @@ -371,9 +371,6 @@ rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime -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 evolution-%{evo_major} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang @@ -448,7 +445,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/evolution/%{evo_major} # Modules: -%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_major} %{_libdir}/evolution/%{evo_major}/modules From 3400457114974318dc4ac8b0d7dc28e7e1124a63 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 9 Sep 2009 03:59:28 +0000 Subject: [PATCH 52/75] No more IDL files either. --- evolution.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9c82374..64e2bdb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -436,9 +436,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/48x48/apps/* %{_datadir}/icons/hicolor/scalable/apps/* -# IDL files (should this be in devel subpackage?) -%{_datadir}/idl/evolution-%{evo_major} - # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution From f9a7c5a9ef854465726ed21b26dca9da8f373c9e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 9 Sep 2009 09:51:54 +0000 Subject: [PATCH 53/75] Enable mailing-list-actions plugin. --- evolution.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 64e2bdb..a3e9b6a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -566,9 +566,8 @@ rm -rf $RPM_BUILD_ROOT %{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-mailing-list-actions.xml +%{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 From d48470ed8b68771be2162ee02ed5cecf47552521 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 13 Sep 2009 15:28:51 +0000 Subject: [PATCH 54/75] - Snapshot of "kill-bonobo" progress at commit f8a2538. --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e33a48b..aa4659a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-0a47d87.tar.bz2 +evolution-2.29.1-kill-bonobo-f8a2538.tar.bz2 diff --git a/evolution.spec b/evolution.spec index a3e9b6a..38e595b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 0a47d87 +%define hash f8a2538 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -47,7 +47,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.5%{?dist} +Release: 1.kb.6%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -671,6 +671,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Sun Sep 13 2009 Matthew Barnes - 2.27.99-1.kb.6.fc12 +- Snapshot of "kill-bonobo" progress at commit f8a2538. + * Tue Sep 08 2009 Matthew Barnes - 2.27.99-1.kb.5.fc12 - Snapshot of "kill-bonobo" progress at commit 0a47d87. diff --git a/sources b/sources index c29cc22..671ca63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84efc5b17b678292d07b8da65f97122f evolution-2.29.1-kill-bonobo-0a47d87.tar.bz2 +2c95705bbd990367b34606dc1450fdf9 evolution-2.29.1-kill-bonobo-f8a2538.tar.bz2 From b41277b5713a412cedb150b629226aaceafc27aa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 13 Sep 2009 16:19:29 +0000 Subject: [PATCH 55/75] Fix files list. --- evolution.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/evolution.spec b/evolution.spec index 38e595b..d2bb36d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -387,7 +387,6 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null @@ -415,7 +414,6 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas -%{_sysconfdir}/gconf/schemas/apps-evolution-external-editor.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas @@ -530,12 +528,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-google.eplug %{evo_plugin_dir}/liborg-gnome-evolution-google.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-evolution-profiler.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-profiler.so - %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so @@ -547,12 +539,6 @@ rm -rf $RPM_BUILD_ROOT #%{evo_plugin_dir}/org-gnome-folder-permissions.xml #%{evo_plugin_dir}/org-gnome-folder-subscription.xml -%{evo_plugin_dir}/org-gnome-external-editor.eplug -%{evo_plugin_dir}/liborg-gnome-external-editor.so - -%{evo_plugin_dir}/org-gnome-face.eplug -%{evo_plugin_dir}/liborg-gnome-face.so - #%{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 From c0b74537191eb154b6b28b85d6ffe97d1485e36c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 13 Sep 2009 16:56:34 +0000 Subject: [PATCH 56/75] Fix files list again. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index d2bb36d..9c86975 100644 --- a/evolution.spec +++ b/evolution.spec @@ -543,8 +543,8 @@ rm -rf $RPM_BUILD_ROOT #%{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-gw-account-setup.eplug +%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so From 185abf84fa4e92ade42920af23feb22b52cf8442 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 17 Sep 2009 11:36:00 +0000 Subject: [PATCH 57/75] - Fix evolution-data-server requirement for real this time. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9c86975..18254b5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.6%{?dist} +Release: 1.kb.7%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -80,7 +80,7 @@ Requires(post): scrollkeeper >= %{scrollkeeper_version} Requires(postun): scrollkeeper >= %{scrollkeeper_version} # Don't trust evolution-data-server to maintain accurate sonames. -Requires: evolution-data-server >= %{version} +Requires: evolution-data-server >= %{eds_version} # No devel package for libpst, despite the name. Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -169,7 +169,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= %{version} +Requires: evolution-data-server-devel >= %{eds_version} Requires: gtk2-devel >= %{gtk2_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libbonobo-devel >= %{libbonobo_version} @@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Thu Sep 17 2009 Matthew Barnes - 2.27.99-1.kb.7.fc12 +- Fix evolution-data-server requirement for real this time. + * Sun Sep 13 2009 Matthew Barnes - 2.27.99-1.kb.6.fc12 - Snapshot of "kill-bonobo" progress at commit f8a2538. From 29c31c1f7ea77ced25c49c0ce951d976e1500487 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Sep 2009 18:07:41 +0000 Subject: [PATCH 58/75] - Snapshot of "kill-bonobo" progress at commit 6ae7523. - Drop the libbonobo, libbonoboui and libgnomeui dependencies. --- .cvsignore | 2 +- evolution.spec | 14 ++++++-------- sources | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index aa4659a..a5bed0b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-f8a2538.tar.bz2 +evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 18254b5..6ed300d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash f8a2538 +%define hash 6ae7523 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -13,8 +13,6 @@ %define gtkhtml_version 3.25.3 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 -%define libbonobo_version 2.20.3 -%define libbonoboui_version 2.4.2 %define libgweather_version 2.25.4 %define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 @@ -47,7 +45,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.7%{?dist} +Release: 1.kb.8%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -112,11 +110,8 @@ BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: gvfs BuildRequires: intltool >= %{intltool_version} -BuildRequires: libbonobo-devel >= %{libbonobo_version} -BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libcanberra-devel BuildRequires: libgnomecanvas-devel >= 2.0 -BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 @@ -172,7 +167,6 @@ Requires: %{name} = %{version}-%{release} Requires: evolution-data-server-devel >= %{eds_version} Requires: gtk2-devel >= %{gtk2_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} -Requires: libbonobo-devel >= %{libbonobo_version} Requires: libgweather-devel >= %{libgweather_version} Requires: libsoup-devel >= %{soup_version} Requires: libxml2-devel @@ -657,6 +651,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Fri Sep 18 2009 Matthew Barnes - 2.27.99-1.kb.8.fc12 +- Snapshot of "kill-bonobo" progress at commit 6ae7523. +- Drop the libbonobo, libbonoboui and libgnomeui dependencies. + * Thu Sep 17 2009 Matthew Barnes - 2.27.99-1.kb.7.fc12 - Fix evolution-data-server requirement for real this time. diff --git a/sources b/sources index 671ca63..e1a94f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c95705bbd990367b34606dc1450fdf9 evolution-2.29.1-kill-bonobo-f8a2538.tar.bz2 +f36ef03f378baba9bc3e5b9ec56b288d evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2 From 6b2e727c9600d1f1cd3174b2d55256434dd9bec5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Sep 2009 19:13:59 +0000 Subject: [PATCH 59/75] Fix tarball. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e1a94f3..3eb1d79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f36ef03f378baba9bc3e5b9ec56b288d evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2 +3d79e145c0a5ee82dc34fa61af322052 evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2 From 2ddaa9ba894489c1bc3ae262d02111be5a0b70dc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Sep 2009 19:50:57 +0000 Subject: [PATCH 60/75] No more killev. --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 6ed300d..27aeb7b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -470,7 +470,6 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export #%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify %{_libexecdir}/evolution/%{evo_major}/evolution-backup -%{_libexecdir}/evolution/%{evo_major}/killev # The plugin directory: %dir %{evo_plugin_dir} From 1b41165ad9c143767c179fe16365343b696bafa5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Sep 2009 20:19:56 +0000 Subject: [PATCH 61/75] Fix file list. --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 27aeb7b..d2e90ed 100644 --- a/evolution.spec +++ b/evolution.spec @@ -417,8 +417,12 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution +# The alarm notify daemon +%{_bindir}/evolution-alarm-notify + # Desktop files: %{_datadir}/applications/evolution.desktop +%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop # Icons: %{_datadir}/icons/hicolor/16x16/apps/* @@ -468,7 +472,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/evolution %dir %{_libexecdir}/evolution/%{evo_major} %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export -#%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify %{_libexecdir}/evolution/%{evo_major}/evolution-backup # The plugin directory: From 20767cc05fbd9ac0972ced3443d650f813bebdd3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 19 Sep 2009 20:05:00 +0000 Subject: [PATCH 62/75] - Snapshot of "kill-bonobo" progress at commit 041daf6. --- .cvsignore | 2 +- evolution.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index a5bed0b..c6712fc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2 +evolution-2.29.1-kill-bonobo-041daf6.tar.bz2 diff --git a/evolution.spec b/evolution.spec index d2e90ed..e39054c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 6ae7523 +%define hash 041daf6 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.8%{?dist} +Release: 1.kb.9%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -589,7 +589,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %{_datadir}/gtk-doc/html/eshell %{_includedir}/evolution-%{evo_major} +%{_libdir}/pkgconfig/evolution-calendar.pc +%{_libdir}/pkgconfig/evolution-mail.pc %{_libdir}/pkgconfig/evolution-plugin.pc +%{_libdir}/pkgconfig/evolution-shell.pc #%{_libdir}/evolution/%{evo_major}/libefilterbar.so %{_libdir}/evolution/%{evo_major}/libeabutil.so %{_libdir}/evolution/%{evo_major}/libeconduit.so @@ -601,7 +604,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libessmime.so %{_libdir}/evolution/%{evo_major}/libetable.so %{_libdir}/evolution/%{evo_major}/libetext.so -%{_libdir}/pkgconfig/evolution-shell.pc %{_libdir}/evolution/%{evo_major}/libetimezonedialog.so %{_libdir}/evolution/%{evo_major}/libeutil.so %{_libdir}/evolution/%{evo_major}/libevolution-a11y.so @@ -653,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Sat Sep 19 2009 Matthew Barnes - 2.27.99-1.kb.9.fc12 +- Snapshot of "kill-bonobo" progress at commit 041daf6. + * Fri Sep 18 2009 Matthew Barnes - 2.27.99-1.kb.8.fc12 - Snapshot of "kill-bonobo" progress at commit 6ae7523. - Drop the libbonobo, libbonoboui and libgnomeui dependencies. diff --git a/sources b/sources index 3eb1d79..9bc24f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d79e145c0a5ee82dc34fa61af322052 evolution-2.29.1-kill-bonobo-6ae7523.tar.bz2 +29ba0f32fd2ad5637c0ef2cf66a64698 evolution-2.29.1-kill-bonobo-041daf6.tar.bz2 From ce1e20fcad4a3ce8544e5e04f1db787ab67ac5bb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 21 Sep 2009 03:31:16 +0000 Subject: [PATCH 63/75] - Snapshot of "kill-bonobo" progress at commit 41dbadc. --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c6712fc..49c67e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-041daf6.tar.bz2 +evolution-2.29.1-kill-bonobo-41dbadc.tar.bz2 diff --git a/evolution.spec b/evolution.spec index e39054c..603db72 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 041daf6 +%define hash 41dbadc %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -655,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Sun Sep 20 2009 Matthew Barnes - 2.27.99-1.kb.10.fc12 +- Snapshot of "kill-bonobo" progress at commit 41dbadc. + * Sat Sep 19 2009 Matthew Barnes - 2.27.99-1.kb.9.fc12 - Snapshot of "kill-bonobo" progress at commit 041daf6. diff --git a/sources b/sources index 9bc24f2..4c03159 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29ba0f32fd2ad5637c0ef2cf66a64698 evolution-2.29.1-kill-bonobo-041daf6.tar.bz2 +51c3c681a9c2bb1b0f8d59bfea4c7b01 evolution-2.29.1-kill-bonobo-41dbadc.tar.bz2 From c339ba2706b880c7a643d06d4ffad7ff7f7d9373 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 21 Sep 2009 04:39:12 +0000 Subject: [PATCH 64/75] Forgot to bump the release tag. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 603db72..89512e5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.27.99 -Release: 1.kb.9%{?dist} +Release: 1.kb.10%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL From 0c1bef308abc53689e429957b7b0e92de7b2cdf8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 21 Sep 2009 17:30:21 +0000 Subject: [PATCH 65/75] - Bump version to 2.28.99 to stay ahead of Fedora 12. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 89512e5..146d135 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.27.99 -Release: 1.kb.10%{?dist} +Version: 2.28.99 +Release: 1.kb.1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -68,7 +68,7 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Override the version to 2.27.99 (and API_VERSION to 2.28). +# Override the version to 2.28.99 (and API_VERSION to 2.28). Patch13: evolution-kb-override-version.patch ## Dependencies ### @@ -655,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Sep 21 2009 Matthew Barnes - 2.28.99-1.kb.1.fc12 +- Bump version to 2.28.99 to stay ahead of Fedora 12. + * Sun Sep 20 2009 Matthew Barnes - 2.27.99-1.kb.10.fc12 - Snapshot of "kill-bonobo" progress at commit 41dbadc. From 90878b181dd18b45a6188dfb8b8d65d582d79222 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 23 Sep 2009 22:44:09 +0000 Subject: [PATCH 66/75] - Snapshot of "kill-bonobo" progress at commit 0c1afa3. --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 49c67e0..d8c30a3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-41dbadc.tar.bz2 +evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 146d135..73a1909 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 41dbadc +%define hash 0c1afa3 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.28.99 -Release: 1.kb.1%{?dist} +Release: 1.kb.2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -655,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Wed Sep 23 2009 Matthew Barnes - 2.28.99-1.kb.2.fc12 +- Snapshot of "kill-bonobo" progress at commit 0c1afa3. + * Mon Sep 21 2009 Matthew Barnes - 2.28.99-1.kb.1.fc12 - Bump version to 2.28.99 to stay ahead of Fedora 12. diff --git a/sources b/sources index 4c03159..e4e9381 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51c3c681a9c2bb1b0f8d59bfea4c7b01 evolution-2.29.1-kill-bonobo-41dbadc.tar.bz2 +448b519564cb448f647f7be76fe85817 evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2 From a046b200567c99a4cf6740f117f4bd869f5b49c3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 23 Sep 2009 22:55:28 +0000 Subject: [PATCH 67/75] Fix build requirement. --- evolution.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 73a1909..1251957 100644 --- a/evolution.spec +++ b/evolution.spec @@ -80,10 +80,8 @@ Requires(postun): scrollkeeper >= %{scrollkeeper_version} # Don't trust evolution-data-server to maintain accurate sonames. Requires: evolution-data-server >= %{eds_version} -# No devel package for libpst, despite the name. Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-themes -Requires: libpst ### Build Dependencies ### @@ -113,6 +111,7 @@ BuildRequires: intltool >= %{intltool_version} BuildRequires: libcanberra-devel BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgweather-devel >= %{libgweather_version} +BuildRequires: libpst BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel From f363e43cd2273b5d105488a8bfee97a8011c1a1e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 23 Sep 2009 23:11:13 +0000 Subject: [PATCH 68/75] D'oh! Fix a typo. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1251957..9d2f167 100644 --- a/evolution.spec +++ b/evolution.spec @@ -111,7 +111,7 @@ BuildRequires: intltool >= %{intltool_version} BuildRequires: libcanberra-devel BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgweather-devel >= %{libgweather_version} -BuildRequires: libpst +BuildRequires: libpst-devel BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel From d0e4c6193e95527bcd93a1b6bd60bd65e9cd1aa1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 23 Sep 2009 23:50:23 +0000 Subject: [PATCH 69/75] Fix files list. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9d2f167..bebf2cc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -538,8 +538,8 @@ rm -rf $RPM_BUILD_ROOT #%{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-gw-account-setup.eplug +#%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so From c09a9ab96c2b6a72dfa2b62e4736f53d28b2856c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Sep 2009 00:23:14 +0000 Subject: [PATCH 70/75] Fix files list, again. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index bebf2cc..251c795 100644 --- a/evolution.spec +++ b/evolution.spec @@ -534,9 +534,9 @@ rm -rf $RPM_BUILD_ROOT #%{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-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 @@ -565,6 +565,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-prefer-plain.eplug %{evo_plugin_dir}/liborg-gnome-prefer-plain.so +%{evo_plugin_dir}/org-gnome-pst-import.eplug +%{evo_plugin_dir}/liborg-gnome-pst-import.so + %{evo_plugin_dir}/org-gnome-publish-calendar.eplug %{evo_plugin_dir}/liborg-gnome-publish-calendar.so From e0d4b82c007a956b5e568570042dfea2270dbedb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 29 Sep 2009 11:36:22 +0000 Subject: [PATCH 71/75] - Snapshot of "kill-bonobo" progress at commit 2fa61f4. --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d8c30a3..93ad9b0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2 +evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 251c795..5a6321b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 0c1afa3 +%define hash 2fa61f4 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.28.99 -Release: 1.kb.2%{?dist} +Release: 1.kb.3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Sep 29 2009 Matthew Barnes - 2.28.99-1.kb.3.fc12 +- Snapshot of "kill-bonobo" progress at commit 2fa61f4. + * Wed Sep 23 2009 Matthew Barnes - 2.28.99-1.kb.2.fc12 - Snapshot of "kill-bonobo" progress at commit 0c1afa3. diff --git a/sources b/sources index e4e9381..8827e52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -448b519564cb448f647f7be76fe85817 evolution-2.29.1-kill-bonobo-0c1afa3.tar.bz2 +6f3e9f57c256b2596df051a6e42ca3b8 evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2 From dc3ae341e5dbc24533591c657efa5ab293038859 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 29 Sep 2009 12:35:54 +0000 Subject: [PATCH 72/75] Fix file list. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 5a6321b..612acb5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -526,8 +526,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so -#%{evo_plugin_dir}/org-gnome-exchange-operations.eplug -#%{evo_plugin_dir}/liborg-gnome-exchange-operations.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 From d124712bf02876c90bf235e91d7dd04a6ca3584a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 30 Oct 2009 03:15:29 +0000 Subject: [PATCH 73/75] - Snapshot of "kill-bonobo" progress at commit adadf13. --- .cvsignore | 2 +- evolution-kb-override-version.patch | 10 +++++----- evolution.spec | 11 +++++++---- sources | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 93ad9b0..d84f530 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2 +evolution-2.29.2-kill-bonobo-adadf13.tar.bz2 diff --git a/evolution-kb-override-version.patch b/evolution-kb-override-version.patch index ce5c1d3..084e46c 100644 --- a/evolution-kb-override-version.patch +++ b/evolution-kb-override-version.patch @@ -1,11 +1,11 @@ -diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evolution-2.29.1-kill-bonobo-0a47d87/configure.ac ---- evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version 2009-09-08 19:41:23.000000000 -0400 -+++ evolution-2.29.1-kill-bonobo-0a47d87/configure.ac 2009-09-08 22:53:53.636195371 -0400 +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], [1]) +-m4_define([evo_micro_version], [2]) +m4_define([evo_minor_version], [27]) +m4_define([evo_micro_version], [99]) m4_define([evo_version], @@ -30,4 +30,4 @@ diff -up evolution-2.29.1-kill-bonobo-0a47d87/configure.ac.override-version evol +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.27.90]) + m4_define([libgtkhtml_minimum_version], [3.29.1]) diff --git a/evolution.spec b/evolution.spec index 612acb5..8c6b537 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # This is an unofficial RPM for testing Evolution's kill-bonobo branch. -%define hash 2fa61f4 +%define hash adadf13 %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -45,13 +45,13 @@ Name: evolution Version: 2.28.99 -Release: 1.kb.3%{?dist} +Release: 1.kb.4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: %{name}-2.29.1-kill-bonobo-%{hash}.tar.bz2 +Source: %{name}-2.29.2-kill-bonobo-%{hash}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -222,7 +222,7 @@ Requires: %{name} = %{version}-%{release} This package contains supplemental utilities for %{name} that require Perl. %prep -%setup -q -n %{name}-2.29.1-kill-bonobo-%{hash} +%setup -q -n %{name}-2.29.2-kill-bonobo-%{hash} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset @@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Thu Oct 29 2009 Matthew Barnes - 2.28.99-1.kb.4.fc12 +- Snapshot of "kill-bonobo" progress at commit adadf13. + * Tue Sep 29 2009 Matthew Barnes - 2.28.99-1.kb.3.fc12 - Snapshot of "kill-bonobo" progress at commit 2fa61f4. diff --git a/sources b/sources index 8827e52..a463126 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f3e9f57c256b2596df051a6e42ca3b8 evolution-2.29.1-kill-bonobo-2fa61f4.tar.bz2 +a4e70c3dacff4169f9ae4fcc626b7a27 evolution-2.29.2-kill-bonobo-adadf13.tar.bz2 From dc2c606bef602ddc06719c0ab13545f01e802767 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 30 Oct 2009 03:53:05 +0000 Subject: [PATCH 74/75] Fix file list. --- evolution.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8c6b537..2199fd9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -526,8 +526,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.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 From 2deafab3c415a701d40b853cd6e4ca837f349ad5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 30 Oct 2009 04:28:18 +0000 Subject: [PATCH 75/75] Fix files list, again. --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 2199fd9..bfc1bd8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -442,6 +442,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/modules # Shared libraries: +%{_libdir}/evolution/%{evo_major}/libcomposer.so.* %{_libdir}/evolution/%{evo_major}/libeabutil.so.* %{_libdir}/evolution/%{evo_major}/libeconduit.so.* %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* @@ -593,6 +594,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-mail.pc %{_libdir}/pkgconfig/evolution-plugin.pc %{_libdir}/pkgconfig/evolution-shell.pc +%{_libdir}/evolution/%{evo_major}/libcomposer.so #%{_libdir}/evolution/%{evo_major}/libefilterbar.so %{_libdir}/evolution/%{evo_major}/libeabutil.so %{_libdir}/evolution/%{evo_major}/libeconduit.so