From d62245cb0cc6e63549f7e849512f822c541b96aca0bce7590c57e077cfd431c7 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 18 Dec 2009 12:57:57 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=54 --- bnc-210959-evo-accept-ics.patch | 21 ++++-- bnc-433448-backup-restore-fails.patch | 2 +- bnc-435668-hide-accept.patch | 8 +- bnc-435722-book-uri-long.patch | 6 +- ...440634-forwarded-hide-accept-decline.patch | 12 +-- evolution-2.28.0.tar.bz2 | 3 + evolution-2.29.3.1.tar.bz2 | 3 - evolution-as-needed.patch | 11 ++- evolution-custom-openldap-includes.patch | 23 +++--- evolution-eds2.29.3.patch | 13 ---- evolution-shared-nss-db.patch | 20 +++-- evolution.changes | 23 ------ evolution.spec | 74 +++++++++---------- fix-exchange-menuitem.diff | 48 ++++++++++++ 14 files changed, 138 insertions(+), 129 deletions(-) create mode 100644 evolution-2.28.0.tar.bz2 delete mode 100644 evolution-2.29.3.1.tar.bz2 delete mode 100644 evolution-eds2.29.3.patch create mode 100644 fix-exchange-menuitem.diff diff --git a/bnc-210959-evo-accept-ics.patch b/bnc-210959-evo-accept-ics.patch index 2488520..9b2a99f 100644 --- a/bnc-210959-evo-accept-ics.patch +++ b/bnc-210959-evo-accept-ics.patch @@ -1,8 +1,8 @@ Index: plugins/itip-formatter/itip-formatter.c =================================================================== ---- plugins/itip-formatter/itip-formatter.c.orig -+++ plugins/itip-formatter/itip-formatter.c -@@ -1860,6 +1860,26 @@ idle_open_cb (gpointer data) +--- 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) return FALSE; } @@ -29,7 +29,7 @@ Index: plugins/itip-formatter/itip-formatter.c static void view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) { -@@ -1906,7 +1926,7 @@ view_response_cb (GtkWidget *widget, Iti +@@ -1664,7 +1684,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; -@@ -1916,7 +1936,7 @@ view_response_cb (GtkWidget *widget, Iti +@@ -1674,7 +1694,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; } -@@ -1935,7 +1955,7 @@ view_response_cb (GtkWidget *widget, Iti +@@ -1693,7 +1713,7 @@ view_response_cb (GtkWidget *widget, Iti if (status) { e_cal_component_rescan (pitip->comp); flag = update_item (pitip, response); @@ -56,3 +56,12 @@ 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); + } diff --git a/bnc-433448-backup-restore-fails.patch b/bnc-433448-backup-restore-fails.patch index 13df533..8c3f403 100644 --- a/bnc-433448-backup-restore-fails.patch +++ b/bnc-433448-backup-restore-fails.patch @@ -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" -@@ -267,6 +268,7 @@ restore (const gchar *filename) +@@ -252,6 +253,7 @@ restore (const char *filename) replace_in_file (GCONF_DUMP_PATH, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ()); diff --git a/bnc-435668-hide-accept.patch b/bnc-435668-hide-accept.patch index d8f8eb4..32bd5af 100644 --- a/bnc-435668-hide-accept.patch +++ b/bnc-435668-hide-accept.patch @@ -1,8 +1,6 @@ -Index: plugins/itip-formatter/itip-formatter.c -=================================================================== ---- plugins/itip-formatter/itip-formatter.c.orig +--- plugins/itip-formatter/itip-formatter.c +++ plugins/itip-formatter/itip-formatter.c -@@ -2112,6 +2112,14 @@ in_proper_folder (CamelFolder *folder) +@@ -1923,6 +1923,14 @@ in_proper_folder (CamelFolder *folder) if (!folder) return res; @@ -16,4 +14,4 @@ Index: plugins/itip-formatter/itip-formatter.c + uri = mail_tools_folder_to_url (folder); - if (mail_folder_cache_get_folder_info_flags (folder, &flags)) { + res = !(folder->folder_flags & CAMEL_FOLDER_IS_TRASH) && diff --git a/bnc-435722-book-uri-long.patch b/bnc-435722-book-uri-long.patch index 162a8e9..9f82afe 100644 --- a/bnc-435722-book-uri-long.patch +++ b/bnc-435722-book-uri-long.patch @@ -1,8 +1,8 @@ Index: addressbook/printing/e-contact-print.c =================================================================== ---- addressbook/printing/e-contact-print.c.orig -+++ addressbook/printing/e-contact-print.c -@@ -265,8 +265,20 @@ e_contact_print_contact (EContact *conta +--- addressbook/printing/e-contact-print.c (revision 36615) ++++ addressbook/printing/e-contact-print.c (working copy) +@@ -266,8 +266,20 @@ if (value == NULL || *value == '\0') continue; diff --git a/bnc-440634-forwarded-hide-accept-decline.patch b/bnc-440634-forwarded-hide-accept-decline.patch index 360473c..6dfbb6b 100644 --- a/bnc-440634-forwarded-hide-accept-decline.patch +++ b/bnc-440634-forwarded-hide-accept-decline.patch @@ -1,10 +1,10 @@ Index: plugins/itip-formatter/itip-formatter.c =================================================================== ---- 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))); - } +--- 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); + /*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; -@@ -2210,6 +2216,15 @@ format_itip_object (EMFormatHTML *efh, G +@@ -2000,6 +2006,15 @@ response_enabled = in_proper_folder (((EMFormat*)efh)->folder); diff --git a/evolution-2.28.0.tar.bz2 b/evolution-2.28.0.tar.bz2 new file mode 100644 index 0000000..da2b0eb --- /dev/null +++ b/evolution-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c93920a1e5e8391487b31a3d28c21e0a4b5131285fdafa6cad9fd6ee6cdf3ba1 +size 36166429 diff --git a/evolution-2.29.3.1.tar.bz2 b/evolution-2.29.3.1.tar.bz2 deleted file mode 100644 index c3e20ed..0000000 --- a/evolution-2.29.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a22483241e8098014d7888a5332ecfa7014fc5980a370116d932ccc1cc49cfb -size 38204222 diff --git a/evolution-as-needed.patch b/evolution-as-needed.patch index d2c5095..1c5d21a 100644 --- a/evolution-as-needed.patch +++ b/evolution-as-needed.patch @@ -1,8 +1,7 @@ -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 +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 @@ CFLAGS_save="$CFLAGS" CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS" @@ -13,7 +12,7 @@ Index: evolution-2.29.3.1/configure.ac AC_CACHE_CHECK([if pilot-link handles UTF-8 conversions],[ac_cv_pilot_link_utf8], AC_RUN_IFELSE([AC_LANG_SOURCE( -@@ -743,7 +743,7 @@ if test "x$enable_pilot_conduits" = "xye +@@ -694,7 +694,7 @@ )],[ac_cv_pilot_link_utf8=yes],[ac_cv_pilot_link_utf8=no],[ac_cv_pilot_link_utf8=no])) CFLAGS="$CFLAGS_save" diff --git a/evolution-custom-openldap-includes.patch b/evolution-custom-openldap-includes.patch index 3ebd522..6ae21cd 100644 --- a/evolution-custom-openldap-includes.patch +++ b/evolution-custom-openldap-includes.patch @@ -1,13 +1,12 @@ -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 +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 @@ - SAVE_CFLAGS="$CFLAGS" - SAVE_LIBS="$LIBS" -- LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED" -+ LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED -I$with_openldap/include" - CFLAGS="$CFLAGS $LDAP_CFLAGS" - LIBS="$LIBS $LDAP_LIBS" - AC_CHECK_FUNCS(ldap_ntlm_bind) + SAVE_CFLAGS="$CFLAGS" + SAVE_LIBS="$LIBS" +-LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED" ++LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED -I$with_openldap/include" + CFLAGS="$CFLAGS $LDAP_CFLAGS" + LIBS="$LIBS $LDAP_LIBS" + AC_CHECK_FUNCS(ldap_ntlm_bind) diff --git a/evolution-eds2.29.3.patch b/evolution-eds2.29.3.patch deleted file mode 100644 index f2534d1..0000000 --- a/evolution-eds2.29.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: evolution-2.29.3.1/configure.ac -=================================================================== ---- evolution-2.29.3.1.orig/configure.ac -+++ evolution-2.29.3.1/configure.ac -@@ -43,7 +43,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.29.3]) - m4_define([gnome_icon_theme_minimum_version], [2.19.91]) - m4_define([gnome_desktop_minimum_version], [2.26.0]) - m4_define([libgtkhtml_minimum_version], [3.29.2]) diff --git a/evolution-shared-nss-db.patch b/evolution-shared-nss-db.patch index 0ca3148..fc4a7b9 100644 --- a/evolution-shared-nss-db.patch +++ b/evolution-shared-nss-db.patch @@ -1,8 +1,7 @@ -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 +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 AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) msg_smime="yes (Mozilla NSS)" fi @@ -12,11 +11,10 @@ Index: evolution-2.29.3.1/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]) -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 @@ +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 @@ #include "e-util/e-dialog-utils.h" #include "e-util/e-util-private.h" #include @@ -24,7 +22,7 @@ Index: evolution-2.29.3.1/smime/lib/e-cert-db.c #include #include #include -@@ -166,7 +167,12 @@ initialize_nss (void) +@@ -169,7 +170,12 @@ initialize_nss (void) #endif /* we initialize NSS here to make sure it only happens once */ diff --git a/evolution.changes b/evolution.changes index 6427d90..187c276 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,26 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/evolution.spec b/evolution.spec index a928839..6b60e63 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.29.3.1) +# spec file for package evolution (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,14 +38,12 @@ 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 @@ -60,15 +58,14 @@ BuildRequires: update-desktop-files 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.30 -Version: 2.29.3.1 +%define evolution_base_version 2.28 +Version: 2.28.0 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-FIX-UPSTREAM evolution-eds2.29.3.patch dimstar@opensuse.org -- e-d-s 2.29.3.1 was never released / tagged. -Patch0: evolution-eds2.29.3.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 # 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. @@ -77,23 +74,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 -# NEEDS-REBASE sharepoint-account-setup.patch pchenthill@suse.de -- This patch allows you to connect to sharepoint servers (WAS: PATCH-FIX-UPSTREAM) +# PATCH-FIX-UPSTREAM sharepoint-account-setup.patch pchenthill@suse.de -- This patch allows you to connect to sharepoint servers. 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-NEEDS-REBASE sp-tasks-setup.diff pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM) +# PATCH-FIX-UPSTREAM sp-tasks-setup.diff pchenthill@suse.de -- Patch needs to be upstreamed. Patch36: sp-tasks-setup.diff -# PATCH-NEEDS-REBASE sp-meetingworkspace-ui.patch pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM) +# PATCH-FIX-UPSTREAM sp-meetingworkspace-ui.patch pchenthill@suse.de -- Patch needs to be upstreamed. Patch41: sp-meetingworkspace-ui.patch -# PATCH-NEEDS-REBASE bnc-449888-handle-no-workspace.patch bnc449888 pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM) +# 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-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-NEEDS-REBASE: sp-process-meetings.diff pchenthill@suse.de -- Fix for bug 449899 (bnc) (WAS: PATCH-FIX-SLED) +# PATCH-FIX-SLED sp-process-meetings.diff pchenthill@suse.de -- Fix for bug 449899 (bnc) 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 @@ -116,15 +113,16 @@ 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 = %{version} -Obsoletes: evolution2-devel < %{version} +Provides: evolution2-devel +Obsoletes: evolution2-devel %description devel This package contains all necessary include files and libraries needed @@ -168,26 +166,21 @@ Evolution or embed the existing ones in other applications. %setup -q translation-update-upstream #gnome-patch-translation-prepare -%patch0 -p1 # %patch7 +%patch8 %patch15 -p1 %patch16 -p1 %patch18 %patch19 -# NEEDS-REBASE -#%patch23 -p1 +%patch23 -p1 %patch25 %patch35 -# NEEDS-REBASE -#%patch36 -p1 -# NEEDS-REBASE -#%patch41 -p1 -# NEEDS-REBASE -#%patch42 -p1 +%patch36 -p1 +%patch41 -p1 +%patch42 -p1 %patch53 #%patch54 -# NEEDS-REBASE -#%patch101 -p1 +%patch101 -p1 %patch102 -p1 #gnome-patch-translation-update @@ -220,9 +213,6 @@ 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 @@ -264,17 +254,18 @@ 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.* -%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.* +%{_libdir}/evolution/*/components %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.* @@ -282,6 +273,7 @@ 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.* @@ -291,10 +283,13 @@ 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.* @@ -307,6 +302,7 @@ 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 @@ -314,7 +310,6 @@ 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 @@ -323,7 +318,6 @@ fi %{_includedir}/* %{_libdir}/evolution/%{evolution_base_version}/*.so %{_libdir}/pkgconfig/*.pc -%{_datadir}/gtk-doc/html/eshell %files pilot %defattr(-,root,root) @@ -332,7 +326,7 @@ fi %files mono-plugins %defattr(-,root,root) -%{_libdir}/evolution/*/modules/*-module-plugin-mono.* +%{_libdir}/evolution/*/plugins/*-evolution-mono.* # Dice support is disabled #%{_libdir}/evolution/*/plugins/*-sharepoint-* #%{_libdir}/evolution/*/plugins/*.dll diff --git a/fix-exchange-menuitem.diff b/fix-exchange-menuitem.diff new file mode 100644 index 0000000..3d5d077 --- /dev/null +++ b/fix-exchange-menuitem.diff @@ -0,0 +1,48 @@ +=== 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 @@ + + +- + + + +=== 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 @@ + + +- + + + +=== 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 @@ + + +- + + + +=== 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 @@ + + +- + + +