This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
21fe320fa6
commit
16944963e3
@ -1,237 +0,0 @@
|
||||
--- mail/em-migrate.c 2008/12/22 06:23:09 36924
|
||||
+++ mail/em-migrate.c 2008/12/22 06:41:05 36925
|
||||
@@ -2842,20 +2842,54 @@
|
||||
g_object_unref (client);
|
||||
}
|
||||
|
||||
-
|
||||
+static gboolean
|
||||
+update_progress_in_main_thread (double *progress)
|
||||
+{
|
||||
+ em_migrate_set_progress (*progress);
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
-migrate_folders(CamelStore *store, CamelFolderInfo *fi, const char *acc, CamelException *ex)
|
||||
+migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const char *acc, CamelException *ex, gboolean *done, int *nth_folder, int total_folders)
|
||||
{
|
||||
CamelFolder *folder;
|
||||
|
||||
while (fi) {
|
||||
+ double progress;
|
||||
+
|
||||
+ *nth_folder = *nth_folder + 1;
|
||||
+
|
||||
char *tmp = g_strdup_printf ("%s/%s", acc, fi->full_name);
|
||||
em_migrate_set_folder_name (tmp);
|
||||
g_free (tmp);
|
||||
- folder = camel_store_get_folder (store, fi->full_name, 0, ex);
|
||||
+
|
||||
+ progress = (double) (*nth_folder) / total_folders;
|
||||
+ g_idle_add ((GSourceFunc) update_progress_in_main_thread, &progress);
|
||||
+
|
||||
+ if (is_local)
|
||||
+ folder = camel_store_get_folder (store, fi->full_name, CAMEL_STORE_IS_MIGRATING, ex);
|
||||
+ else
|
||||
+ folder = camel_store_get_folder (store, fi->full_name, 0, ex);
|
||||
+
|
||||
if (folder != NULL)
|
||||
camel_folder_summary_migrate_infos (folder->summary);
|
||||
- migrate_folders(store, fi->child, acc, ex);
|
||||
+
|
||||
+ migrate_folders(store, is_local, fi->child, acc, ex, done, nth_folder, total_folders);
|
||||
+
|
||||
+ fi = fi->next;
|
||||
+ }
|
||||
+
|
||||
+ if ( (*nth_folder) == (total_folders - 1))
|
||||
+ *done = TRUE;
|
||||
+}
|
||||
+
|
||||
+/* This could be in CamelStore.ch */
|
||||
+static void
|
||||
+count_folders (CamelFolderInfo *fi, int *count)
|
||||
+{
|
||||
+ while (fi) {
|
||||
+ *count = *count + 1;
|
||||
+ count_folders (fi->child , count);
|
||||
fi = fi->next;
|
||||
}
|
||||
}
|
||||
@@ -2878,75 +2912,111 @@
|
||||
return store;
|
||||
|
||||
}
|
||||
+
|
||||
+struct migrate_folders_to_db_structure {
|
||||
+ char *account_name;
|
||||
+ CamelException ex;
|
||||
+ CamelStore *store;
|
||||
+ CamelFolderInfo *info;
|
||||
+ gboolean done;
|
||||
+ gboolean is_local_store;
|
||||
+};
|
||||
+
|
||||
+static void migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs)
|
||||
+{
|
||||
+ int num_of_folders = 0, nth_folder = 0;
|
||||
+ count_folders (migrate_dbs->info, &num_of_folders);
|
||||
+ migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info,
|
||||
+ migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done),
|
||||
+ &nth_folder, num_of_folders);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
migrate_to_db()
|
||||
{
|
||||
- EAccountList *accounts;
|
||||
- EIterator *iter;
|
||||
- int i=0, len;
|
||||
- MailComponent *component = mail_component_peek ();
|
||||
- CamelStore *store = NULL;
|
||||
- CamelFolderInfo *info;
|
||||
-
|
||||
- if (!(accounts = mail_config_get_accounts ()))
|
||||
- return;
|
||||
-
|
||||
- iter = e_list_get_iterator ((EList *) accounts);
|
||||
- len = e_list_length ((EList *) accounts);
|
||||
-
|
||||
- camel_session_set_online ((CamelSession *) session, FALSE);
|
||||
- em_migrate_setup_progress_dialog (_("The summary format of the Evolution mailbox "
|
||||
- "folders has been moved to sqlite since Evolution 2.24.\n\nPlease be "
|
||||
- "patient while Evolution migrates your folders..."));
|
||||
-
|
||||
- em_migrate_set_progress ( (double)i/(len+1));
|
||||
- store = setup_local_store (component);
|
||||
- info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL);
|
||||
- if (info) {
|
||||
- migrate_folders(store, info, _("On This Computer"), NULL);
|
||||
- }
|
||||
- i++;
|
||||
- em_migrate_set_progress ( (double)i/(len+1));
|
||||
-
|
||||
-
|
||||
- while (e_iterator_is_valid (iter)) {
|
||||
- EAccount *account = (EAccount *) e_iterator_get (iter);
|
||||
- EAccountService *service;
|
||||
- const char *name;
|
||||
-
|
||||
-
|
||||
- service = account->source;
|
||||
- name = account->name;
|
||||
- em_migrate_set_progress ( (double)i/(len+1));
|
||||
- if (account->enabled
|
||||
- && service->url != NULL
|
||||
- && service->url[0]
|
||||
- && strncmp(service->url, "mbox:", 5) != 0) {
|
||||
-
|
||||
- CamelException ex;
|
||||
-
|
||||
- camel_exception_init (&ex);
|
||||
- mail_component_load_store_by_uri (component, service->url, name);
|
||||
-
|
||||
- store = (CamelStore *) camel_session_get_service (session, service->url, CAMEL_PROVIDER_STORE, &ex);
|
||||
- info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &ex);
|
||||
- if (info) {
|
||||
- migrate_folders(store, info, account->name, &ex);
|
||||
-
|
||||
- } else
|
||||
- printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC);
|
||||
- camel_exception_clear(&ex);
|
||||
-
|
||||
+ EAccountList *accounts;
|
||||
+ EIterator *iter;
|
||||
+ int i=0, len;
|
||||
+ MailComponent *component = mail_component_peek ();
|
||||
+ CamelStore *store = NULL;
|
||||
+ CamelFolderInfo *info;
|
||||
+
|
||||
+ if (!(accounts = mail_config_get_accounts ()))
|
||||
+ return;
|
||||
+
|
||||
+ iter = e_list_get_iterator ((EList *) accounts);
|
||||
+ len = e_list_length ((EList *) accounts);
|
||||
+
|
||||
+ camel_session_set_online ((CamelSession *) session, FALSE);
|
||||
+
|
||||
+ em_migrate_setup_progress_dialog (_("The summary format of the Evolution mailbox "
|
||||
+ "folders has been moved to SQLite since Evolution 2.24.\n\nPlease be "
|
||||
+ "patient while Evolution migrates your folders..."));
|
||||
+
|
||||
+ store = setup_local_store (component);
|
||||
+ info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL);
|
||||
+
|
||||
+ if (info) {
|
||||
+ struct migrate_folders_to_db_structure migrate_dbs;
|
||||
+
|
||||
+ if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local"))
|
||||
+ migrate_dbs.is_local_store = TRUE;
|
||||
+ else
|
||||
+ migrate_dbs.is_local_store = FALSE;
|
||||
+ camel_exception_init (&migrate_dbs.ex);
|
||||
+ migrate_dbs.account_name = _("On This Computer");
|
||||
+ migrate_dbs.info = info;
|
||||
+ migrate_dbs.store = store;
|
||||
+ migrate_dbs.done = FALSE;
|
||||
+
|
||||
+ GThread *thread;
|
||||
+ thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL);
|
||||
+ while (!migrate_dbs.done)
|
||||
+ g_main_context_iteration (NULL, TRUE);
|
||||
}
|
||||
i++;
|
||||
- e_iterator_next (iter);
|
||||
-
|
||||
- }
|
||||
-
|
||||
- //camel_session_set_online ((CamelSession *) session, TRUE);
|
||||
-
|
||||
- g_object_unref (iter);
|
||||
- em_migrate_close_progress_dialog ();
|
||||
+ while (e_iterator_is_valid (iter)) {
|
||||
+ EAccount *account = (EAccount *) e_iterator_get (iter);
|
||||
+ EAccountService *service;
|
||||
+ const char *name;
|
||||
+
|
||||
+ service = account->source;
|
||||
+ name = account->name;
|
||||
+ if (account->enabled
|
||||
+ && service->url != NULL
|
||||
+ && service->url[0]
|
||||
+ && strncmp(service->url, "mbox:", 5) != 0) {
|
||||
+
|
||||
+ CamelException ex;
|
||||
+
|
||||
+ camel_exception_init (&ex);
|
||||
+ mail_component_load_store_by_uri (component, service->url, name);
|
||||
+
|
||||
+ store = (CamelStore *) camel_session_get_service (session, service->url, CAMEL_PROVIDER_STORE, &ex);
|
||||
+ info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &ex);
|
||||
+ if (info) {
|
||||
+ struct migrate_folders_to_db_structure migrate_dbs;
|
||||
+
|
||||
+ migrate_dbs.ex = ex;
|
||||
+ migrate_dbs.account_name = account->name;
|
||||
+ migrate_dbs.info = info;
|
||||
+ migrate_dbs.store = store;
|
||||
+ migrate_dbs.done = FALSE;
|
||||
+
|
||||
+ GThread *thread;
|
||||
+ thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL);
|
||||
+ while (!migrate_dbs.done)
|
||||
+ g_main_context_iteration (NULL, TRUE);
|
||||
+ } else
|
||||
+ printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC);
|
||||
+ camel_exception_clear(&ex);
|
||||
+ }
|
||||
+ i++;
|
||||
+ e_iterator_next (iter);
|
||||
+ }
|
||||
+ //camel_session_set_online ((CamelSession *) session, TRUE);
|
||||
+ g_object_unref (iter);
|
||||
+ em_migrate_close_progress_dialog ();
|
||||
}
|
||||
|
||||
int
|
||||
@ -1,12 +0,0 @@
|
||||
Index: plugins/mono/mono-plugin.c
|
||||
===================================================================
|
||||
--- plugins/mono/mono-plugin.c (revision 37224)
|
||||
+++ plugins/mono/mono-plugin.c (working copy)
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <mono/metadata/appdomain.h>
|
||||
#include <mono/metadata/assembly.h>
|
||||
#include <mono/metadata/threads.h>
|
||||
+#include <mono/metadata/mono-config.h>
|
||||
#include <mono/jit/jit.h>
|
||||
|
||||
#define d(x) (x)
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0823c676b04f9094dce87b89907573fb818ff419316ee0e630da69ac0f9f2e8b
|
||||
size 30219567
|
||||
3
evolution-2.25.91.tar.bz2
Normal file
3
evolution-2.25.91.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:724f38d2d1ebed3a737cc903922737ffd1a5a42157656de1896eee90d53dfeea
|
||||
size 28807292
|
||||
@ -1,20 +0,0 @@
|
||||
--- data/evolution.desktop.in.in 2008-10-13 14:03:02.000000000 +0530
|
||||
+++ data/evolution.desktop.in.in 2009-01-05 10:41:39.000000000 +0530
|
||||
@@ -1,14 +1,15 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
-_Name=Evolution Mail and Calendar
|
||||
+_Name=Evolution
|
||||
_GenericName=Groupware Suite
|
||||
_Comment=Manage your email, contacts and schedule
|
||||
Exec=evolution
|
||||
Icon=evolution
|
||||
Terminal=false
|
||||
Type=Application
|
||||
-Categories=GNOME;GTK;Office;Email;Calendar;ContactManagement;X-Red-Hat-Base;
|
||||
+Categories=GNOME;GTK;Office;X-Red-Hat-Base;
|
||||
StartupNotify=true
|
||||
+DocPath=evolution-@BASE_VERSION@
|
||||
X-GNOME-Bugzilla-Bugzilla=GNOME
|
||||
X-GNOME-Bugzilla-Product=Evolution
|
||||
X-GNOME-Bugzilla-Component=BugBuddyBugs
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 17 11:18:30 IST 2009 - msuman@suse.de
|
||||
|
||||
- Update to version 2.25.91:
|
||||
+ Bugs fixed: bgo#333716, bgo#404232, bgo#548623, bgo#554458,
|
||||
bgo#555888, bgo#564229, bgo#567089, bgo#568176, bgo#569700,
|
||||
bgo#569986, bgo#570364, bgo#571625
|
||||
+ Updated translations
|
||||
- Uncomment the patches which apply cleanly, rebase those which
|
||||
don't and ensure that the build does not break.
|
||||
- Dropped the following patches fixed upstream:
|
||||
+ bgo-559153-evo-migration.patch
|
||||
+ compiler-warnings.diff
|
||||
- Dropped evolution-desktop.patch: These changes should be made by
|
||||
passing parameters to %suse_update_desktop_file
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 10 20:43:31 CET 2009 - vuntz@novell.com
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package evolution (Version 2.25.90)
|
||||
# spec file for package evolution (Version 2.25.91)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -56,14 +56,13 @@ License: LGPL v2.0 only; LGPL v3 only
|
||||
Group: Productivity/Networking/Email/Clients
|
||||
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
|
||||
%define evolution_base_version 2.26
|
||||
Version: 2.25.90
|
||||
Release: 2
|
||||
Version: 2.25.91
|
||||
Release: 1
|
||||
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
||||
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
|
||||
Source1: summerdance-about2.png
|
||||
Source2: ximian-evolution-desktop-files.tar.bz2
|
||||
Source3: ximian-evolution-pixmaps.tar.bz2
|
||||
Patch4: evolution-desktop.patch
|
||||
# PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number
|
||||
Patch7: calendar-sendbutton.patch
|
||||
Patch8: fix-exchange-menuitem.diff
|
||||
@ -88,14 +87,10 @@ Patch36: sp-tasks-setup.diff
|
||||
Patch41: sp-meetingworkspace-ui.patch
|
||||
# PATCH-FIX-UPSTREAM bnc-449888-handle-no-workspace.patch bnc449888 pchenthill@suse.de -- Patch needs to be upstreamed.
|
||||
Patch42: bnc-449888-handle-no-workspace.patch
|
||||
# PATCH-NEEDS-REBASE bgo-559153-evo-migration.patch bgo559153 psankar@suse.de -- Patch is part of GNOME 2.25.5 release.
|
||||
Patch43: bgo-559153-evo-migration.patch
|
||||
# PATCH-FIX-SLED bnc-440634-forwarded-hide-accept-decline.patch bnc440634 abharath@suse.de -- Make GW understand folders better.
|
||||
Patch53: bnc-440634-forwarded-hide-accept-decline.patch
|
||||
# PATCH-FIX-SLED bnc-445996-address-conflict.patch bnc445996 shashish@suse.de -- Needs to be moved out of glade files.
|
||||
Patch54: bnc-445996-address-conflict.patch
|
||||
# PATCH-FIX-UPSTREAM compiler-warnings.diff msuman@suse.de -- Fix for a few compiler warnings, available upstream in 2.25.91
|
||||
Patch63: compiler-warnings.diff
|
||||
# PATCH-FIX-SLED sp-process-meetings.diff pchenthill@suse.de -- Fix for bug 449899 (bnc)
|
||||
Patch101: sp-process-meetings.diff
|
||||
Url: http://gnome.org/projects/evolution/
|
||||
@ -431,8 +426,7 @@ Authors:
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
gnome-patch-translation-prepare
|
||||
%patch4
|
||||
#gnome-patch-translation-prepare
|
||||
# %patch7
|
||||
%patch8
|
||||
%patch9
|
||||
@ -440,29 +434,22 @@ gnome-patch-translation-prepare
|
||||
%patch16 -p1
|
||||
%patch18
|
||||
%patch19
|
||||
# Disable: breaks the build
|
||||
#%patch23 -p1
|
||||
%patch23 -p1
|
||||
%patch25
|
||||
%patch35
|
||||
# Disable: breaks the build
|
||||
#%patch36 -p1
|
||||
# Disable: breaks the build
|
||||
#%patch41 -p1
|
||||
# Disable: breaks the build
|
||||
#%patch42 -p1
|
||||
###%patch43
|
||||
%patch36 -p1
|
||||
%patch41 -p1
|
||||
%patch42 -p1
|
||||
%patch53
|
||||
%patch54
|
||||
%patch63
|
||||
# Disable: breaks the build
|
||||
#%patch101 -p1
|
||||
gnome-patch-translation-update
|
||||
%patch101 -p1
|
||||
#gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
|
||||
export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
%{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
|
||||
%{configure} \
|
||||
--disable-scrollkeeper \
|
||||
@ -478,7 +465,6 @@ export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
|
||||
--enable-nss=yes \
|
||||
--enable-smime=yes \
|
||||
--enable-exchange=yes \
|
||||
--enable-ipv6=yes \
|
||||
--enable-default-binary=yes \
|
||||
--enable-mono=yes \
|
||||
--enable-icedesktop=no \
|
||||
@ -495,19 +481,16 @@ popd
|
||||
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.la
|
||||
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.la
|
||||
%{__cp} %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/evolution/%evolution_base_version/images/about-box.png
|
||||
for xml in $RPM_BUILD_ROOT/%{_datadir}/gnome/help/evolution-*/*/evolution-*.xml; do
|
||||
meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
|
||||
done
|
||||
# Install and update the SUSE desktop files.
|
||||
%{__tar} --bzip2 -xf %{SOURCE2} -C $RPM_BUILD_ROOT/%{_datadir}/applications/
|
||||
%suse_update_desktop_file -G "Mail" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-mail" evolution-email
|
||||
%suse_update_desktop_file -G "Address Book" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-contact" evolution-addressbook
|
||||
%suse_update_desktop_file -G "Schedule Manager" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-calendar" evolution-calendar
|
||||
%suse_update_desktop_file -G "Task List" -D "evolution-%evolution_base_version/evolution-%evolution_base_version.xml?usage-calendar-todo" evolution-tasklist
|
||||
%suse_update_desktop_file -G "Mail and Calendar" -D "evolution-%evolution_base_version" evolution Core-Office
|
||||
# Install the Ximian pixmaps.
|
||||
%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/pixmaps
|
||||
%{__tar} --bzip2 -xf %{SOURCE3} -C $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
|
||||
# Install and update the SUSE desktop files.
|
||||
%{__tar} --bzip2 -xf %{SOURCE2} -C $RPM_BUILD_ROOT/%{_datadir}/applications/
|
||||
%suse_update_desktop_file -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution Core-Office
|
||||
%suse_update_desktop_file evolution-addressbook
|
||||
%suse_update_desktop_file evolution-calendar
|
||||
%suse_update_desktop_file evolution-email
|
||||
%suse_update_desktop_file evolution-tasklist
|
||||
%find_lang evolution-%evolution_base_version
|
||||
%find_lang evolution evolution-%evolution_base_version.lang
|
||||
%find_gconf_schemas
|
||||
@ -516,7 +499,7 @@ done
|
||||
%fdupes $RPM_BUILD_ROOT
|
||||
%if %suse_version > 1100
|
||||
%{__mv} $RPM_BUILD_ROOT/%{_bindir}/evolution $RPM_BUILD_ROOT/%{_bindir}/evolution.bin
|
||||
echo -e "#!/bin/sh\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \$@\n" > $RPM_BUILD_ROOT/%{_bindir}/evolution
|
||||
echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > $RPM_BUILD_ROOT/%{_bindir}/evolution
|
||||
%{__chmod} +x $RPM_BUILD_ROOT/%{_bindir}/evolution
|
||||
%endif
|
||||
|
||||
@ -545,7 +528,6 @@ fi
|
||||
%{_datadir}/applications/*.desktop
|
||||
%{_datadir}/evolution
|
||||
%{_datadir}/idl/*
|
||||
%{_datadir}/omf/*
|
||||
%{_datadir}/pixmaps/*.png
|
||||
%{_datadir}/icons/hicolor/*/apps/*.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/*.svg
|
||||
@ -622,6 +604,19 @@ fi
|
||||
#%{_libdir}/evolution/*/plugins/*.dll
|
||||
|
||||
%changelog
|
||||
* Mon Feb 16 2009 msuman@suse.de
|
||||
- Update to version 2.25.91:
|
||||
+ Bugs fixed: bgo#333716, bgo#404232, bgo#548623, bgo#554458,
|
||||
bgo#555888, bgo#564229, bgo#567089, bgo#568176, bgo#569700,
|
||||
bgo#569986, bgo#570364, bgo#571625
|
||||
+ Updated translations
|
||||
- Uncomment the patches which apply cleanly, rebase those which
|
||||
don't and ensure that the build does not break.
|
||||
- Dropped the following patches fixed upstream:
|
||||
+ bgo-559153-evo-migration.patch
|
||||
+ compiler-warnings.diff
|
||||
- Dropped evolution-desktop.patch: These changes should be made by
|
||||
passing parameters to %%suse_update_desktop_file
|
||||
* Tue Feb 10 2009 vuntz@novell.com
|
||||
- Remove non-upstream translations: they'll get out-of-date.
|
||||
* Thu Feb 05 2009 vuntz@novell.com
|
||||
|
||||
@ -474,7 +474,7 @@ Index: evolution-2.25.90/configure.in
|
||||
MONO_PLUGIN="mono"
|
||||
+ PKG_CHECK_MODULES(MONO_PLATFORM,
|
||||
+ [glib-sharp-2.0, gtk-sharp-2.0, gconf-sharp-2.0, gnome-sharp-2.0,
|
||||
+ evolution-sharp, ndesk-dbus-1.0, ndesk-dbus-glib-1.0, solvent])
|
||||
+ evolution-sharp, ndesk-dbus-1.0, ndesk-dbus-glib-1.0])
|
||||
+ AC_SUBST(MONO_PLATFORM_CFLAGS)
|
||||
+ AC_SUBST(MONO_PLATFORM_LIBS)
|
||||
+ MONO_BASED_PLUGINS=""
|
||||
@ -485,7 +485,7 @@ Index: evolution-2.25.90/configure.in
|
||||
+ [Build sharepoint provider]),
|
||||
+ [enable_icedesktop=$enableval],[enable_icedesktop=no])
|
||||
+ if test "x${enable_icedesktop}" = "xyes"; then
|
||||
+ PKG_CHECK_MODULES(ICE_DESKTOP, [Novell.IceDesktop])
|
||||
+ PKG_CHECK_MODULES(ICE_DESKTOP, [Novell.IceDesktop, solvent])
|
||||
+ AC_SUBST(ICE_DESKTOP_CFLAGS)
|
||||
+ AC_SUBST(ICE_DESKTOP_LIBS)
|
||||
+ MONO_BASED_PLUGINS="$MONO_BASED_PLUGINS sharepoint-account-setup"
|
||||
|
||||
@ -944,27 +944,26 @@ Index: evolution-2.25.90/configure.in
|
||||
===================================================================
|
||||
--- evolution-2.25.90.orig/configure.in
|
||||
+++ evolution-2.25.90/configure.in
|
||||
@@ -917,6 +917,10 @@ MONO_CFLAGS=
|
||||
MONO_LIBS=
|
||||
AC_ARG_ENABLE([mono],
|
||||
AC_HELP_STRING([--enable-mono],
|
||||
+ SHAREPOINT_FEATURES=sharepoint-features
|
||||
+ PKG_CHECK_MODULES(DBUS, dbus-glib-1)
|
||||
+ AC_SUBST(DBUS_CFLAGS)
|
||||
+ AC_SUBST(DBUS_LIBS)
|
||||
[Add Mono embedded hooks.]),
|
||||
[enable_mono=$enableval],[enable_mono=no])
|
||||
if test "x${enable_mono}" = "xyes"; then
|
||||
@@ -1793,7 +1797,7 @@ AC_ARG_ENABLE([plugins],
|
||||
dnl Add any new plugins here
|
||||
plugins_base_always="calendar-file calendar-http $CALENDAR_WEATHER itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup"
|
||||
@@ -928,6 +928,9 @@ if test "x${enable_mono}" = "xyes"; then
|
||||
evolution-sharp, ndesk-dbus-1.0, ndesk-dbus-glib-1.0])
|
||||
AC_SUBST(MONO_PLATFORM_CFLAGS)
|
||||
AC_SUBST(MONO_PLATFORM_LIBS)
|
||||
+ PKG_CHECK_MODULES(DBUS, dbus-glib-1)
|
||||
+ AC_SUBST(DBUS_CFLAGS)
|
||||
+ AC_SUBST(DBUS_LIBS)
|
||||
MONO_BASED_PLUGINS=""
|
||||
|
||||
-plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN $MONO_BASED_PLUGINS"
|
||||
+plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $SHAREPOINT_FEATURES $EXCHANGE_PLUGIN $MONO_PLUGIN $MONO_BASED_PLUGINS"
|
||||
all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono"
|
||||
|
||||
plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates pst-import"
|
||||
@@ -2139,6 +2143,7 @@ plugins/face/Makefile
|
||||
dnl Sharepoint account setup
|
||||
@@ -939,7 +942,7 @@ if test "x${enable_mono}" = "xyes"; then
|
||||
PKG_CHECK_MODULES(ICE_DESKTOP, [Novell.IceDesktop, solvent])
|
||||
AC_SUBST(ICE_DESKTOP_CFLAGS)
|
||||
AC_SUBST(ICE_DESKTOP_LIBS)
|
||||
- MONO_BASED_PLUGINS="$MONO_BASED_PLUGINS sharepoint-account-setup"
|
||||
+ MONO_BASED_PLUGINS="$MONO_BASED_PLUGINS sharepoint-account-setup sharepoint-features"
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(MONO_CFLAGS)
|
||||
@@ -2139,6 +2142,7 @@ plugins/face/Makefile
|
||||
plugins/external-editor/Makefile
|
||||
plugins/webdav-account-setup/Makefile
|
||||
plugins/sharepoint-account-setup/Makefile
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1ca63f93f210f28de69546a03e6b6d7ca4c089a6848d1557ac769db63c22d8f0
|
||||
size 489
|
||||
oid sha256:fafbe2a75a4a7709d6c95c6c10e37bc60ad71c2261df552a51a961ba67a4eda8
|
||||
size 514
|
||||
|
||||
Loading…
Reference in New Issue
Block a user