Accepting request 27636 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/evolution via accept of submit request 27636 revision 4.
Request was accepted with message:
accept

OBS-URL: https://build.opensuse.org/request/show/27636
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=55
This commit is contained in:
Vincent Untz 2009-12-24 19:31:48 +00:00 committed by Git OBS Bridge
parent d62245cb0c
commit c4faf3231f
13 changed files with 181 additions and 142 deletions

View File

@ -1,8 +1,8 @@
Index: plugins/itip-formatter/itip-formatter.c
===================================================================
--- plugins/itip-formatter/itip-formatter.c (revision 35641)
+++ plugins/itip-formatter/itip-formatter.c (working copy)
@@ -1620,6 +1620,26 @@ idle_open_cb (gpointer data)
--- plugins/itip-formatter/itip-formatter.c.orig
+++ plugins/itip-formatter/itip-formatter.c
@@ -1860,6 +1860,26 @@ idle_open_cb (gpointer data)
return FALSE;
}
@ -29,7 +29,7 @@ Index: plugins/itip-formatter/itip-formatter.c
static void
view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
{
@@ -1664,7 +1684,7 @@ view_response_cb (GtkWidget *widget, Iti
@@ -1906,7 +1926,7 @@ view_response_cb (GtkWidget *widget, Iti
if (status) {
e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response);
@ -38,7 +38,7 @@ Index: plugins/itip-formatter/itip-formatter.c
delete_invitation_from_cache = TRUE;
}
break;
@@ -1674,7 +1694,7 @@ view_response_cb (GtkWidget *widget, Iti
@@ -1916,7 +1936,7 @@ view_response_cb (GtkWidget *widget, Iti
if (status) {
e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response);
@ -47,7 +47,7 @@ Index: plugins/itip-formatter/itip-formatter.c
delete_invitation_from_cache = TRUE;
}
@@ -1693,7 +1713,7 @@ view_response_cb (GtkWidget *widget, Iti
@@ -1935,7 +1955,7 @@ view_response_cb (GtkWidget *widget, Iti
if (status) {
e_cal_component_rescan (pitip->comp);
flag = update_item (pitip, response);
@ -56,12 +56,3 @@ Index: plugins/itip-formatter/itip-formatter.c
delete_invitation_from_cache = TRUE;
}
break;
@@ -1753,7 +1773,7 @@ view_response_cb (GtkWidget *widget, Iti
}
}
- if (!save_schedules && pitip->delete_message) {
+ if (!delete_invitation_from_cache && pitip->delete_message) {
g_message ("Deleting!");
camel_folder_delete_message (pitip->folder, pitip->uid);
}

View File

@ -10,7 +10,7 @@ Index: plugins/backup-restore/backup.c
#define EVOLUTION_DIR "$HOME/.evolution/"
#define EVOLUTION_DIR_BACKUP "$HOME/.evolution-old/"
#define GCONF_DUMP_FILE "backup-restore-gconf.xml"
@@ -252,6 +253,7 @@ restore (const char *filename)
@@ -267,6 +268,7 @@ restore (const gchar *filename)
replace_in_file (GCONF_DUMP_PATH, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());

View File

@ -1,6 +1,8 @@
--- plugins/itip-formatter/itip-formatter.c
Index: plugins/itip-formatter/itip-formatter.c
===================================================================
--- plugins/itip-formatter/itip-formatter.c.orig
+++ plugins/itip-formatter/itip-formatter.c
@@ -1923,6 +1923,14 @@ in_proper_folder (CamelFolder *folder)
@@ -2115,6 +2115,14 @@ in_proper_folder (CamelFolder *folder)
if (!folder)
return res;
@ -14,4 +16,4 @@
+
uri = mail_tools_folder_to_url (folder);
res = !(folder->folder_flags & CAMEL_FOLDER_IS_TRASH) &&
if (mail_folder_cache_get_folder_info_flags (mail_folder_cache_get_default (),

View File

@ -1,8 +1,8 @@
Index: addressbook/printing/e-contact-print.c
===================================================================
--- addressbook/printing/e-contact-print.c (revision 36615)
+++ addressbook/printing/e-contact-print.c (working copy)
@@ -266,8 +266,20 @@
--- addressbook/printing/e-contact-print.c.orig
+++ addressbook/printing/e-contact-print.c
@@ -265,8 +265,20 @@ e_contact_print_contact (EContact *conta
if (value == NULL || *value == '\0')
continue;

View File

@ -1,10 +1,10 @@
Index: plugins/itip-formatter/itip-formatter.c
===================================================================
--- plugins/itip-formatter/itip-formatter.c (revision 36884)
+++ plugins/itip-formatter/itip-formatter.c (working copy)
@@ -1955,6 +1955,12 @@
!em_utils_folder_is_outbox (folder, uri) &&
!em_utils_folder_is_drafts (folder, uri);
--- plugins/itip-formatter/itip-formatter.c.orig
+++ plugins/itip-formatter/itip-formatter.c
@@ -2164,6 +2164,12 @@ in_proper_folder (CamelFolder *folder)
!em_utils_folder_is_drafts (folder, uri)));
}
+ /*FIXME: GW needs to set the drafts_folder_uri and sent_folder_uri properly.
+ A workaround till then */
@ -15,7 +15,7 @@ Index: plugins/itip-formatter/itip-formatter.c
g_free (uri);
return res;
@@ -2000,6 +2006,15 @@
@@ -2210,6 +2216,15 @@ format_itip_object (EMFormatHTML *efh, G
response_enabled = in_proper_folder (((EMFormat*)efh)->folder);

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c93920a1e5e8391487b31a3d28c21e0a4b5131285fdafa6cad9fd6ee6cdf3ba1
size 36166429

3
evolution-2.29.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2452e43e377d60d8bfe7bdb1c076b1010e7e6f4b708703e64f0f576bc9e06839
size 29653760

View File

@ -1,7 +1,8 @@
diff -ur evolution-2.27.4.1/configure.ac evolution-2.27.4.1.patched//configure.ac
--- evolution-2.27.4.1/configure.ac 2009-07-15 11:25:24.000000000 +0200
+++ evolution-2.27.4.1.patched//configure.ac 2009-07-22 14:00:14.000000000 +0200
@@ -673,8 +673,8 @@
Index: evolution-2.29.3.1/configure.ac
===================================================================
--- evolution-2.29.3.1.orig/configure.ac
+++ evolution-2.29.3.1/configure.ac
@@ -722,8 +722,8 @@ if test "x$enable_pilot_conduits" = "xye
CFLAGS_save="$CFLAGS"
CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS"
@ -12,7 +13,7 @@ diff -ur evolution-2.27.4.1/configure.ac evolution-2.27.4.1.patched//configure.a
AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],[ac_cv_pilot_link_utf8],
AC_RUN_IFELSE([AC_LANG_SOURCE(
@@ -694,7 +694,7 @@
@@ -743,7 +743,7 @@ if test "x$enable_pilot_conduits" = "xye
)],[ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no]))
CFLAGS="$CFLAGS_save"

View File

@ -1,7 +1,8 @@
diff -ur evolution-2.27.4.1/configure.ac evolution-2.27.4.1.patched/configure.ac
--- evolution-2.27.4.1/configure.ac 2009-07-15 11:25:24.000000000 +0200
+++ evolution-2.27.4.1.patched/configure.ac 2009-07-22 10:25:16.000000000 +0200
@@ -558,7 +558,7 @@
Index: evolution-2.29.3.1/configure.ac
===================================================================
--- evolution-2.29.3.1.orig/configure.ac
+++ evolution-2.29.3.1/configure.ac
@@ -605,7 +605,7 @@ if test "$os_win32" != yes; then
SAVE_CFLAGS="$CFLAGS"
SAVE_LIBS="$LIBS"

View File

@ -1,7 +1,8 @@
diff -upr evolution-2.24.1-old/configure.ac evolution-2.24.1-new/configure.ac
--- evolution-2.24.1-old/configure.ac 2008-10-19 22:27:24.000000000 -0500
+++ evolution-2.24.1-new/configure.ac 2008-10-26 17:46:09.000000000 -0600
@@ -1015,6 +1015,9 @@ if test "x${enable_nss}" = "xyes" || tes
Index: evolution-2.29.3.1/configure.ac
===================================================================
--- evolution-2.29.3.1.orig/configure.ac
+++ evolution-2.29.3.1/configure.ac
@@ -910,6 +910,9 @@ if test "x${enable_nss}" = "xyes" || tes
AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
msg_smime="yes (Mozilla NSS)"
fi
@ -11,10 +12,11 @@ diff -upr evolution-2.24.1-old/configure.ac evolution-2.24.1-new/configure.ac
AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`",[Define to the full path of mozilla nss library])
diff -upr evolution-2.24.1-old/smime/lib/e-cert-db.c evolution-2.24.1-new/smime/lib/e-cert-db.c
--- evolution-2.24.1-old/smime/lib/e-cert-db.c 2008-10-13 03:33:03.000000000 -0500
+++ evolution-2.24.1-new/smime/lib/e-cert-db.c 2008-10-26 19:15:48.000000000 -0600
@@ -76,6 +76,7 @@
Index: evolution-2.29.3.1/smime/lib/e-cert-db.c
===================================================================
--- evolution-2.29.3.1.orig/smime/lib/e-cert-db.c
+++ evolution-2.29.3.1/smime/lib/e-cert-db.c
@@ -73,6 +73,7 @@
#include "e-util/e-dialog-utils.h"
#include "e-util/e-util-private.h"
#include <libedataserverui/e-passwords.h>
@ -22,7 +24,7 @@ diff -upr evolution-2.24.1-old/smime/lib/e-cert-db.c evolution-2.24.1-new/smime/
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -169,7 +170,12 @@ initialize_nss (void)
@@ -166,7 +167,12 @@ initialize_nss (void)
#endif
/* we initialize NSS here to make sure it only happens once */

View File

@ -1,3 +1,90 @@
-------------------------------------------------------------------
Thu Dec 24 18:43:18 CET 2009 - vuntz@opensuse.org
- Update to version 2.29.4:
+ Mailer:
- bgo#596967 - Per-folder setting for threading and preview
panel
- bgo#604884 - Use proper colors in Search bar when is search
activated
- bgo#593896 - "Search -> Find now" should not be always
enabled
- bgo#593700 - Restore folder's last selected message as
expected
- bgo#603184 - Various problems with search box in folders
- bgo#604761 - Select certificate doesn't work
- bgo#553057 - Show signer's information in a message
window/preview
- bgo#602505 - Incorrect information in message window
- bgo#551464 - Paste files into composer as attachments
+ Calendar:
- bgo#596947 - Calendar view forgets memo pane height
- bgo#359755 - Do not fetch content of a CalDAV calendar when
given it
- bgo#604512 - Calendar publishing tab misses button label
- bgo#604182 - Do not block UI with publish-calendar messages
- bgo#359755 - Support for CalDAV collections
- bgo#603682 - Duplicate mnemonic in meeting window
- bgo#603061 - Use .ics for temp vcalendar files
+ Contacts:
- bgo#602998 - Contacts searches are supposed to be per address
book
+ Misc:
- bgo#604838 - Drop unused alert dialog
- bgo#604822 - Drop more alert titles. Drop all alert titles to
be found in *.error.xml.
- bgo#603701 - Don't treat 4 byte values as DDWORDs
- bgo#603342 - Memory leak fixes
- bgo#604562 - Typo in gconf schema
- bgo#604182 - Hide variable used only with HAVE_LIBNOTIFY
- bgo#499322 - Use extension for "Save as" suggested file name
- bgo#603972 - Proper title for dialog
- bgo#591938 - Update translator's comments
- bgo#604098 - Missing \n in EAlert
- bgo#603592 - X11 window roles should be set
- bgo#602963 - Migrate to new EError Apis
+ Misc Fixes
- Punctuation fixes
- EShellContent cleanups.
- Fix distcheck errors.
- Fix a small memory leak in EShellBackend
- Add get_data_dir(), get_config_dir() vfuncs to EShellBackend
- Merge some composer header changes for Anjal.
- Introduce EMailBackend into libevolution-mail.
- Use the boxed CamelObject type for signal params in
MailFolderCache
- Remove mail-config, vfolder, and filter deps from
mail-folder-cache
- Kill ETableScrolled.
- Bump glib requirement to 2.22.0
- Remove libhal requirement from configure
+ Updated translations.
- Drop evolution-eds2.29.3.patch: not needed anymore.
- Update bnc-435668-hide-accept.patch to apply without fuzz.
-------------------------------------------------------------------
Fri Dec 4 11:03:34 CET 2009 - dimstar@opensuse.org
- Require gnome-desktop-devel and libunique-devel from the -devel
package.
-------------------------------------------------------------------
Tue Dec 1 17:46:39 CET 2009 - dimstar@opensuse.org
- Update to version 2.29.3.1:
+ See NEWS file for a list of changes.
- Disable all SharePoint related patches -> NEEDS REBASE.
- Drop fix-exchange-menuitem.diff, as a consequence of bgo#456240:
Move exchange plugin to exchange package
- New BuildRequires: libcanberra-devel, libgtkimageview-devel and
libunique-devel
- Drop libidl BuildRequire
- No longer Require libbonobo-, ligbnome- and libgnomeui-devel from
the -devel package.
- Add evolution-eds2.29.3.patch - e-d-s 2.29.3.1 does not exist.
- Be more strict, by using version numbers, when obsoleting
evolution2-devel.
-------------------------------------------------------------------
Mon Sep 21 22:02:45 CEST 2009 - dimstar@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package evolution (Version 2.28.0)
# spec file for package evolution (Version 2.29.4)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -38,12 +38,14 @@ BuildRequires: gstreamer-0_10-devel
BuildRequires: gtk-doc
BuildRequires: gtkhtml2-devel
BuildRequires: intltool
BuildRequires: libcanberra-devel
BuildRequires: libgtkimageview-devel
BuildRequires: libgweather-devel >= 2.25.4
BuildRequires: libidl
BuildRequires: libnotify-devel
BuildRequires: libpisock-devel
BuildRequires: libpisync-devel
BuildRequires: libpst-devel
BuildRequires: libunique-devel
BuildRequires: libytnef-devel
BuildRequires: mozilla-nss-devel
BuildRequires: nss-shared-helper-devel
@ -55,17 +57,16 @@ BuildRequires: shared-mime-info
BuildRequires: sqlite3-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files
License: LGPL v2.0 only ; LGPL v3 only
License: LGPLv2.0 ; LGPLv3
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.28
Version: 2.28.0
%define evolution_base_version 2.30
Version: 2.29.4
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
# 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
# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
Patch15: evolution-custom-openldap-includes.patch
# PATCH-FEATURE-OPENSUSE evolution-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.
@ -74,23 +75,23 @@ Patch16: evolution-shared-nss-db.patch
Patch18: bnc-435668-hide-accept.patch
# PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
Patch19: bnc-435722-book-uri-long.patch
# PATCH-FIX-UPSTREAM sharepoint-account-setup.patch pchenthill@suse.de -- This patch allows you to connect to sharepoint servers.
# NEEDS-REBASE sharepoint-account-setup.patch pchenthill@suse.de -- This patch allows you to connect to sharepoint servers (WAS: PATCH-FIX-UPSTREAM)
Patch23: sharepoint-account-setup.patch
# PATCH-FIX-OPENSUSE bnc-433448-backup-restore-fails.patch bnc433448 abharath@suse.de -- Not required upstream.
Patch25: bnc-433448-backup-restore-fails.patch
# PATCH-FIX-UPSTREAM bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream.
Patch35: bnc-210959-evo-accept-ics.patch
# PATCH-FIX-UPSTREAM sp-tasks-setup.diff pchenthill@suse.de -- Patch needs to be upstreamed.
# PATCH-NEEDS-REBASE sp-tasks-setup.diff pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM)
Patch36: sp-tasks-setup.diff
# PATCH-FIX-UPSTREAM sp-meetingworkspace-ui.patch pchenthill@suse.de -- Patch needs to be upstreamed.
# PATCH-NEEDS-REBASE sp-meetingworkspace-ui.patch pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM)
Patch41: sp-meetingworkspace-ui.patch
# PATCH-FIX-UPSTREAM bnc-449888-handle-no-workspace.patch bnc449888 pchenthill@suse.de -- Patch needs to be upstreamed.
# PATCH-NEEDS-REBASE bnc-449888-handle-no-workspace.patch bnc449888 pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM)
Patch42: bnc-449888-handle-no-workspace.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-NEEDS-REBASE bnc-445996-address-conflict.patch bnc445996 shashish@suse.de -- Needs to be moved out of glade files. (was PATCH-FIX-SLED)
Patch54: bnc-445996-address-conflict.patch
# PATCH-FIX-SLED sp-process-meetings.diff pchenthill@suse.de -- Fix for bug 449899 (bnc)
# PATCH-NEEDS-REBASE: sp-process-meetings.diff pchenthill@suse.de -- Fix for bug 449899 (bnc) (WAS: PATCH-FIX-SLED)
Patch101: sp-process-meetings.diff
# PATCH-FIX-UPSTREAM evolution-as-needed.patch bgo#589393 dominique-obs@leuenberger.net -- Fix configure with --as-needed
Patch102: evolution-as-needed.patch
@ -107,29 +108,28 @@ of the modular design, it is possible to plug new components into
Evolution or embed the existing ones in other applications.
%package devel
License: LGPL v2.0 only ; LGPL v3 only
License: LGPLv2.0 ; LGPLv3
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: evolution = %{?epoch:}%{version}-%{release}
Requires: evolution-data-server-devel
Requires: gail-devel
Requires: gnome-desktop-devel
Requires: gtkhtml2-devel
Requires: libbonoboui-devel
Requires: libgnome-devel
Requires: libgnomeui-devel
Requires: libgweather-devel >= 2.25.4
Requires: libnotify-devel
Requires: libopenssl-devel
Requires: libunique-devel
Requires: libxml2-devel
Provides: evolution2-devel
Obsoletes: evolution2-devel
Provides: evolution2-devel = %{version}
Obsoletes: evolution2-devel < %{version}
%description devel
This package contains all necessary include files and libraries needed
to develop applications that require these.
%package pilot
License: GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later ; MIT License (or similar)
License: GFDLv1.1 ; GPLv2+ ; LGPLv2.1+ ; MIT License (or similar)
Summary: The Integrated GNOME Mail, Calendar, and Addressbook Suite
Group: Productivity/Networking/Email/Clients
Requires: evolution = %{?epoch:}%{version}-%{release}
@ -141,7 +141,7 @@ of the modular design one can plug new components into Evolution or
embed the existing ones in other applications.
%package mono-plugins
License: LGPL v2.0 only ; LGPL v3 only
License: LGPLv2.0 ; LGPLv3
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Group: Productivity/Networking/Email/Clients
Requires: evolution = %{?epoch:}%{version}-%{release}
@ -167,20 +167,24 @@ Evolution or embed the existing ones in other applications.
translation-update-upstream
#gnome-patch-translation-prepare
# %patch7
%patch8
%patch15 -p1
%patch16 -p1
%patch18
%patch19
%patch23 -p1
# NEEDS-REBASE
#%patch23 -p1
%patch25
%patch35
%patch36 -p1
%patch41 -p1
%patch42 -p1
# NEEDS-REBASE
#%patch36 -p1
# NEEDS-REBASE
#%patch41 -p1
# NEEDS-REBASE
#%patch42 -p1
%patch53
#%patch54
%patch101 -p1
# NEEDS-REBASE
#%patch101 -p1
%patch102 -p1
#gnome-patch-translation-update
@ -213,6 +217,9 @@ popd
%install
%{makeinstall}
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
# Remove the libtool archive files
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*.la
%{__rm} $RPM_BUILD_ROOT/%{_libdir}/evolution/*/*/*.la
@ -254,18 +261,17 @@ fi
%{_bindir}/*
%{_datadir}/applications/*.desktop
%{_datadir}/evolution
%{_datadir}/idl/*
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_libdir}/bonobo/servers/*.server
%dir %{_libdir}/evolution
%dir %{_libdir}/evolution/*
%{_libdir}/evolution/*/*.so.*
%{_libdir}/evolution/*/components
%dir %{_libdir}/evolution/*/modules/
%{_libdir}/evolution/*/modules/*-module-addressbook.*
%{_libdir}/evolution/*/modules/*-module-calendar.*
%{_libdir}/evolution/*/modules/*-module-mail.*
%{_libdir}/evolution/*/modules/*-module-plugin-lib.*
%dir %{_libdir}/evolution/*/plugins
%{_libdir}/evolution/*/plugins/attachment-reminder.glade
%{_libdir}/evolution/*/plugins/templates.glade
%{_libdir}/evolution/*/plugins/*-account-disable.*
%{_libdir}/evolution/*/plugins/*-addressbook-file.*
%{_libdir}/evolution/*/plugins/*-backup-restore.*
%{_libdir}/evolution/*/plugins/*-bogo-junk-plugin.*
@ -273,7 +279,6 @@ fi
%{_libdir}/evolution/*/plugins/*-calendar-http.*
%{_libdir}/evolution/*/plugins/*-calendar-weather.*
%{_libdir}/evolution/*/plugins/*-compose-send-options.*
%{_libdir}/evolution/*/plugins/*-copy-tool.*
%{_libdir}/evolution/*/plugins/*-default-mailer.*
%{_libdir}/evolution/*/plugins/*-default-source.*
%{_libdir}/evolution/*/plugins/*-email-custom-header.*
@ -283,13 +288,10 @@ fi
%{_libdir}/evolution/*/plugins/*-evolution-google.*
%{_libdir}/evolution/*/plugins/*-evolution-startup-wizard.*
%{_libdir}/evolution/*/plugins/*-evolution-webdav.*
%{_libdir}/evolution/*/plugins/*-exchange-*-subscription.*
%{_libdir}/evolution/*/plugins/*-exchange-operations.*
%{_libdir}/evolution/*/plugins/*-folder-*.*
%{_libdir}/evolution/*/plugins/*-gnome-audio-inline.*
%{_libdir}/evolution/*/plugins/*-gnome-image-inline.*
%{_libdir}/evolution/*/plugins/*-gnome-vcard-inline.*
%{_libdir}/evolution/*/plugins/*-groupwise-features.*
%{_libdir}/evolution/*/plugins/*-gw-account-setup.*
%{_libdir}/evolution/*/plugins/*-imap-features.*
%{_libdir}/evolution/*/plugins/*-itip-formatter.*
%{_libdir}/evolution/*/plugins/*-mailing-list-actions.*
@ -302,7 +304,6 @@ fi
%{_libdir}/evolution/*/plugins/*-publish-calendar.*
%{_libdir}/evolution/*/plugins/*-sa-junk-plugin.*
%{_libdir}/evolution/*/plugins/*-save-calendar.*
%{_libdir}/evolution/*/plugins/*-select-one-source.*
%{_libdir}/evolution/*/plugins/*-subject-thread.*
%{_libdir}/evolution/*/plugins/*-templates.*
%dir %{_libexecdir}/evolution
@ -310,6 +311,7 @@ fi
%{_libexecdir}/evolution/*/csv2vcard
%{_libexecdir}/evolution/*/evolution-*
%{_libexecdir}/evolution/*/killev
%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
%files lang -f evolution-%evolution_base_version.lang
@ -318,6 +320,7 @@ fi
%{_includedir}/*
%{_libdir}/evolution/%{evolution_base_version}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/gtk-doc/html/eshell
%files pilot
%defattr(-,root,root)
@ -326,7 +329,7 @@ fi
%files mono-plugins
%defattr(-,root,root)
%{_libdir}/evolution/*/plugins/*-evolution-mono.*
%{_libdir}/evolution/*/modules/*-module-plugin-mono.*
# Dice support is disabled
#%{_libdir}/evolution/*/plugins/*-sharepoint-*
#%{_libdir}/evolution/*/plugins/*.dll

View File

@ -1,48 +0,0 @@
=== modified file 'plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml'
--- plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml 2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml 2007-12-18 20:36:19 +0000
@@ -1,6 +1,6 @@
<Root>
<commands>
- <cmd name="FolderSubscription" _label="Subscribe to Other User's Contacts"
+ <cmd name="FolderSubscription" _label="Subscribe to Other User's Exchange Contacts"
_tip="Subscribe to Other User's Contacts"/>
</commands>
=== modified file 'plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml'
--- plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml 2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml 2007-12-18 20:36:19 +0000
@@ -1,6 +1,6 @@
<Root>
<commands>
- <cmd name="FolderSubscription" _label="Subscribe to Other User's Calendar"
+ <cmd name="FolderSubscription" _label="Subscribe to Other User's Exchange Calendar"
_tip="Subscribe to Other User's Calendar"/>
</commands>
=== modified file 'plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml'
--- plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml 2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml 2007-12-18 20:36:19 +0000
@@ -1,6 +1,6 @@
<Root>
<commands>
- <cmd name="FolderSubscription" _label="Subscribe to Other User's Tasks"
+ <cmd name="FolderSubscription" _label="Subscribe to Other User's Exchange Tasks"
_tip="Subscribe to Other User's Tasks"/>
</commands>
=== modified file 'plugins/exchange-operations/org-gnome-folder-subscription.xml'
--- plugins/exchange-operations/org-gnome-folder-subscription.xml 2007-12-18 20:23:31 +0000
+++ plugins/exchange-operations/org-gnome-folder-subscription.xml 2007-12-18 20:36:19 +0000
@@ -1,6 +1,6 @@
<Root>
<commands>
- <cmd name="FolderSubscription" _label="Subscribe to Other User's Folder"
+ <cmd name="FolderSubscription" _label="Subscribe to Other User's Exchange Folder"
_tip="Subscribe to Other User's Folder"/>
</commands>