From 0fa0407de5ab60edd4074e8d457f608d3046e8d9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 11 Feb 2011 07:57:01 -0500 Subject: [PATCH 01/20] rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index fffd757..4285167 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -604,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Feb 11 2011 Matthias Clasen - 2.91.6.1-4 +- Rebuild against newer gtk + * Tue Feb 08 2011 Fedora Release Engineering - 2.91.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From c21fda84373da9021a929a41f467a34cf30cd761 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 11 Feb 2011 09:48:39 -0500 Subject: [PATCH 02/20] Try again --- evolution-help-gl.patch | 12 ++++++++++++ evolution.spec | 39 +++++---------------------------------- 2 files changed, 17 insertions(+), 34 deletions(-) create mode 100644 evolution-help-gl.patch diff --git a/evolution-help-gl.patch b/evolution-help-gl.patch new file mode 100644 index 0000000..e03b5ef --- /dev/null +++ b/evolution-help-gl.patch @@ -0,0 +1,12 @@ +diff -up evolution-2.91.6.1/help/gl/evolution.xml.gl evolution-2.91.6.1/help/gl/evolution.xml +--- evolution-2.91.6.1/help/gl/evolution.xml.gl 2011-02-11 09:46:55.942967407 -0500 ++++ evolution-2.91.6.1/help/gl/evolution.xml 2011-02-11 09:47:14.788731802 -0500 +@@ -214,7 +214,7 @@ +
+ Definición da súa identidade + A xanela de identidade é o primeiro paso do asistente. +- Aquí pode introducir para información persoal básica. Pode definir varias identidades máis adiante premendo Editar ≷ Preferencias, despois premendo en «Contas de correo». ++ Aquí pode introducir para información persoal básica. Pode definir varias identidades máis adiante premendo Editar gl Preferencias, despois premendo en «Contas de correo». + When the First-Run Assistant starts, the Welcome page is displayed. Click Forward to proceed to the Identity window. + + diff --git a/evolution.spec b/evolution.spec index 4285167..f6f2b16 100644 --- a/evolution.spec +++ b/evolution.spec @@ -48,6 +48,8 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch +Patch15: evolution-help-gl.patch + ## Dependencies ### Requires(pre): GConf2 @@ -203,6 +205,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents +%patch14 -p1 -b .help-gl mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -247,39 +250,8 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" -# Strip unneeded translations from .mo files. -# This reduces the RPM size by several megabytes. -#disabled since 2.31.91 because of a msgmerge floating point exception (see RH bug 628073) -#cd po -#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep -#mv POTFILES.keep POTFILES.in -#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot -#for p in *.po; do -# msgmerge $p %{name}-%{evo_base_version}.pot > $p.out -# msgfmt -o `basename $p .po`.gmo $p.out -#done -#cd - - -# Replace identical images in the help by links. -# This reduces the RPM size by several megabytes. -helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name} -for f in $helpdir/C/figures/*.png; do - b="$(basename $f)" - for d in $helpdir/*; do - if [ -d "$d" -a "$d" != "$helpdir/C" ]; then - g="$d/figures/$b" - if [ -f "$g" ]; then - if cmp -s $f $g; then - rm "$g"; ln -s "../../C/figures/$b" "$g" - fi - fi - fi - done -done - %install -rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 export tagname=CC make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install @@ -372,9 +344,6 @@ fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%clean -rm -rf $RPM_BUILD_ROOT - %files -f translations.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README @@ -606,6 +575,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Feb 11 2011 Matthias Clasen - 2.91.6.1-4 - Rebuild against newer gtk +- Fix a problem with gl help translations +- Drop %%clean * Tue Feb 08 2011 Fedora Release Engineering - 2.91.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 6e061f5b1f49d3f56b4103041d1e4604975dc7aa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 11 Feb 2011 09:49:13 -0500 Subject: [PATCH 03/20] try again --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index f6f2b16..5e80479 100644 --- a/evolution.spec +++ b/evolution.spec @@ -48,7 +48,7 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -Patch15: evolution-help-gl.patch +Patch14: evolution-help-gl.patch ## Dependencies ### From be226dfbd58f271bb9ce49b162527b5359b72933 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 11 Feb 2011 10:35:30 -0500 Subject: [PATCH 04/20] try again --- evolution-help-gl.patch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/evolution-help-gl.patch b/evolution-help-gl.patch index e03b5ef..4ddee79 100644 --- a/evolution-help-gl.patch +++ b/evolution-help-gl.patch @@ -1,12 +1,12 @@ -diff -up evolution-2.91.6.1/help/gl/evolution.xml.gl evolution-2.91.6.1/help/gl/evolution.xml ---- evolution-2.91.6.1/help/gl/evolution.xml.gl 2011-02-11 09:46:55.942967407 -0500 -+++ evolution-2.91.6.1/help/gl/evolution.xml 2011-02-11 09:47:14.788731802 -0500 -@@ -214,7 +214,7 @@ -
- Definición da súa identidade - A xanela de identidade é o primeiro paso do asistente. -- Aquí pode introducir para información persoal básica. Pode definir varias identidades máis adiante premendo Editar ≷ Preferencias, despois premendo en «Contas de correo». -+ Aquí pode introducir para información persoal básica. Pode definir varias identidades máis adiante premendo Editar gl Preferencias, despois premendo en «Contas de correo». - When the First-Run Assistant starts, the Welcome page is displayed. Click Forward to proceed to the Identity window. - - +diff -up evolution-2.91.6.1/help/Makefile.in.gl evolution-2.91.6.1/help/Makefile.in +--- evolution-2.91.6.1/help/Makefile.in.gl 2011-02-11 10:34:44.753102344 -0500 ++++ evolution-2.91.6.1/help/Makefile.in 2011-02-11 10:35:07.402819183 -0500 +@@ -590,7 +590,7 @@ DOC_FIGURES = \ + figures/stock_search.png \ + figures/ver_view_a.png + +-DOC_LINGUAS = cs de el en_GB es eu fr gl oc ru sl sv mk zh_CN ++DOC_LINGUAS = cs de el en_GB es eu fr oc ru sl sv mk zh_CN + all: all-recursive + + .SUFFIXES: From cf7b4e0d94f9f7fe252e2636b00c14d4c97886f0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 11 Feb 2011 11:40:42 -0500 Subject: [PATCH 05/20] try again --- evolution-gtk3.patch | 39 +++++++++++++++++++++++++++++++++++++++ evolution.spec | 3 +++ 2 files changed, 42 insertions(+) create mode 100644 evolution-gtk3.patch diff --git a/evolution-gtk3.patch b/evolution-gtk3.patch new file mode 100644 index 0000000..958c910 --- /dev/null +++ b/evolution-gtk3.patch @@ -0,0 +1,39 @@ +From cdb1098cc61e4b123bfcecb0a1bcd15b293e8aba Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Fri, 11 Feb 2011 09:31:38 +0000 +Subject: Fix a build break due to #error pragma + +--- +diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c +index 6a277fc..467523d 100644 +--- a/widgets/table/e-cell-tree.c ++++ b/widgets/table/e-cell-tree.c +@@ -669,10 +669,21 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, + + /* now draw our icon if we're expandable */ + if (expandable) { +-#if GTK_CHECK_VERSION (3, 0, 0) +- gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); +-#error Paint an expander here +-#endif ++ gboolean expanded; ++ GdkRectangle r; ++ gint exp_size = 0; ++ ++ gtk_widget_style_get (GTK_WIDGET (gtk_widget_get_parent (GTK_WIDGET (tree_view->canvas))), "expander_size", &exp_size, NULL); ++ ++ node = e_cell_tree_get_node (ecell_view->e_table_model, row); ++ expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); ++ ++ r.x = 0; ++ r.y = 0; ++ r.width = MIN (width, exp_size); ++ r.height = height; ++ ++ draw_expander (tree_view, cr, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r); + } + + cairo_stroke (cr); +-- +cgit v0.8.3.1 + diff --git a/evolution.spec b/evolution.spec index 5e80479..37f99ee 100644 --- a/evolution.spec +++ b/evolution.spec @@ -49,6 +49,7 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch Patch13: evolution-2.30.1-help-contents.patch Patch14: evolution-help-gl.patch +Patch15: evolution-gtk3.patch ## Dependencies ### @@ -206,6 +207,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents %patch14 -p1 -b .help-gl +%patch15 -p1 -b .gtk3 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -576,6 +578,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Fri Feb 11 2011 Matthias Clasen - 2.91.6.1-4 - Rebuild against newer gtk - Fix a problem with gl help translations +- Upstream fix for build against gtk3 - Drop %%clean * Tue Feb 08 2011 Fedora Release Engineering - 2.91.6.1-3 From dee29da7792d0e51671e166a992e3d9df6b2563c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 11 Feb 2011 12:11:40 -0500 Subject: [PATCH 06/20] fix patch --- evolution-gtk3.patch | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/evolution-gtk3.patch b/evolution-gtk3.patch index 958c910..780f7d8 100644 --- a/evolution-gtk3.patch +++ b/evolution-gtk3.patch @@ -1,19 +1,12 @@ -From cdb1098cc61e4b123bfcecb0a1bcd15b293e8aba Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 11 Feb 2011 09:31:38 +0000 -Subject: Fix a build break due to #error pragma - ---- -diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c -index 6a277fc..467523d 100644 ---- a/widgets/table/e-cell-tree.c -+++ b/widgets/table/e-cell-tree.c -@@ -669,10 +669,21 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context, +diff -up evolution-2.91.6.1/widgets/table/e-cell-tree.c.gtk3 evolution-2.91.6.1/widgets/table/e-cell-tree.c +--- evolution-2.91.6.1/widgets/table/e-cell-tree.c.gtk3 2011-01-30 11:33:28.000000000 -0500 ++++ evolution-2.91.6.1/widgets/table/e-cell-tree.c 2011-02-11 12:05:27.983052606 -0500 +@@ -679,10 +679,22 @@ ect_print (ECellView *ecell_view, GtkPri - /* now draw our icon if we're expandable */ - if (expandable) { + /* now draw our icon if we're expandable */ + if (expandable) { -#if GTK_CHECK_VERSION (3, 0, 0) -- gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); +- gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); -#error Paint an expander here -#endif + gboolean expanded; @@ -31,9 +24,7 @@ index 6a277fc..467523d 100644 + r.height = height; + + draw_expander (tree_view, cr, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r); - } ++ + } - cairo_stroke (cr); --- -cgit v0.8.3.1 - + cairo_stroke (cr); From 6d7b0ab8f6e57cda810e7fc96574d5115360959c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Feb 2011 16:44:37 +0100 Subject: [PATCH 07/20] Update to 2.91.90 --- .gitignore | 2 ++ evolution-gtk3.patch | 30 ------------------------------ evolution.spec | 24 ++++++++++-------------- sources | 2 +- 4 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 evolution-gtk3.patch diff --git a/.gitignore b/.gitignore index 99e6881..dbd6c44 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.5.tar.bz2 /evolution-2.91.6.tar.bz2 /evolution-2.91.6.1.tar.bz2 +/evolution-2.91.6.2.tar.bz2 +/evolution-2.91.90.tar.bz2 diff --git a/evolution-gtk3.patch b/evolution-gtk3.patch deleted file mode 100644 index 780f7d8..0000000 --- a/evolution-gtk3.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up evolution-2.91.6.1/widgets/table/e-cell-tree.c.gtk3 evolution-2.91.6.1/widgets/table/e-cell-tree.c ---- evolution-2.91.6.1/widgets/table/e-cell-tree.c.gtk3 2011-01-30 11:33:28.000000000 -0500 -+++ evolution-2.91.6.1/widgets/table/e-cell-tree.c 2011-02-11 12:05:27.983052606 -0500 -@@ -679,10 +679,22 @@ ect_print (ECellView *ecell_view, GtkPri - - /* now draw our icon if we're expandable */ - if (expandable) { --#if GTK_CHECK_VERSION (3, 0, 0) -- gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); --#error Paint an expander here --#endif -+ gboolean expanded; -+ GdkRectangle r; -+ gint exp_size = 0; -+ -+ gtk_widget_style_get (GTK_WIDGET (gtk_widget_get_parent (GTK_WIDGET (tree_view->canvas))), "expander_size", &exp_size, NULL); -+ -+ node = e_cell_tree_get_node (ecell_view->e_table_model, row); -+ expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node); -+ -+ r.x = 0; -+ r.y = 0; -+ r.width = MIN (width, exp_size); -+ r.height = height; -+ -+ draw_expander (tree_view, cr, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r); -+ - } - - cairo_stroke (cr); diff --git a/evolution.spec b/evolution.spec index 37f99ee..abd3a5c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -3,8 +3,8 @@ %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 -%define gtk3_version 2.99.2 -%define gtkhtml_version 3.91.6 +%define gtk3_version 3.0.0 +%define gtkhtml_version 3.91.90 %define intltool_version 0.35.5 %define libgdata_version 0.7.0 %define libgweather_version 2.91.0 @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 2.91.6.1 -Release: 4%{?dist} +Version: 2.91.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,7 +49,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch Patch13: evolution-2.30.1-help-contents.patch Patch14: evolution-help-gl.patch -Patch15: evolution-gtk3.patch ## Dependencies ### @@ -57,10 +56,7 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -# Don't trust evolution-data-server to maintain accurate sonames. -# Requires: evolution-data-server >= %{version} -Requires: evolution-data-server >= 2.91.6 - +Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs @@ -75,8 +71,7 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: desktop-file-utils -#BuildRequires: evolution-data-server-devel >= %{version} -BuildRequires: evolution-data-server-devel >= 2.91.6 +BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -141,8 +136,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 >= 2.91.6 +Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -207,7 +201,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents %patch14 -p1 -b .help-gl -%patch15 -p1 -b .gtk3 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -575,6 +568,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Feb 21 2011 Milan Crha - 2.91.90-1 +- Update to 2.91.90 + * Fri Feb 11 2011 Matthias Clasen - 2.91.6.1-4 - Rebuild against newer gtk - Fix a problem with gl help translations diff --git a/sources b/sources index b4001ba..6d3e8db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d394f7b4cfe5c7634827020097e3763a evolution-2.91.6.1.tar.bz2 +43200fbaccdb1cee861336ec34a703bf evolution-2.91.90.tar.bz2 From 7fbe26e50aa0c98416ea0f36e01dcdc7c13b4572 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Feb 2011 17:22:44 +0100 Subject: [PATCH 08/20] Add face plugin files --- evolution.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/evolution.spec b/evolution.spec index abd3a5c..0fdd411 100644 --- a/evolution.spec +++ b/evolution.spec @@ -280,6 +280,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : @@ -300,6 +301,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_eplugin_face.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 || : @@ -317,6 +319,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : @@ -345,6 +348,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : # GConf schemas: %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas +%{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas @@ -461,6 +465,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{evo_plugin_dir}/org-gnome-evolution-google.eplug %{evo_plugin_dir}/liborg-gnome-evolution-google.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 e02964773251caad7d552527bc7a97e7715a5e99 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Mar 2011 13:00:00 +0100 Subject: [PATCH 09/20] Update to 2.91.91 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dbd6c44..6c0b871 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.6.1.tar.bz2 /evolution-2.91.6.2.tar.bz2 /evolution-2.91.90.tar.bz2 +/evolution-2.91.91.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 0fdd411..e6508e3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,7 +11,7 @@ %define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 2.92 +%define evo_base_version 3.0 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.90 +Version: 2.91.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -575,6 +575,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Mar 07 2011 Milan Crha - 2.91.91-1 +- Update to 2.91.91 + * Mon Feb 21 2011 Milan Crha - 2.91.90-1 - Update to 2.91.90 diff --git a/sources b/sources index 6d3e8db..bb22494 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43200fbaccdb1cee861336ec34a703bf evolution-2.91.90.tar.bz2 +b7fbbd81be9190749481c0b5eacc8755 evolution-2.91.91.tar.bz2 From 512fa903b3330a0e60c9b31919cf24dae1d073bc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 11 Mar 2011 10:45:15 -0500 Subject: [PATCH 10/20] Split off an evolution-NetworkManager subpackage. --- evolution.spec | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/evolution.spec b/evolution.spec index e6508e3..9887f21 100644 --- a/evolution.spec +++ b/evolution.spec @@ -21,7 +21,6 @@ %define libnotify_support 1 %define libpst_support 1 %define krb5_support 1 -%define nm_support 1 %define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins @@ -29,7 +28,7 @@ Name: evolution Version: 2.91.91 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -63,6 +62,7 @@ Requires: gvfs ### Build Dependencies ### BuildRequires: GConf2-devel +BuildRequires: NetworkManager-devel BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -113,10 +113,6 @@ BuildRequires: krb5-devel #define krb5dir `pwd`/krb5-fakeprefix %endif -%if %{nm_support} -BuildRequires: NetworkManager-glib-devel -%endif - %if %{libnotify_support} BuildRequires: libnotify-devel %endif @@ -167,6 +163,16 @@ Requires: bogofilter %description bogofilter This package contains the plugin to filter junk mail using Bogofilter. +%package NetworkManager +Group: Applications/Productivity +Summary: NetworkManager plugin for Evolution +Requires: %{name} = %{version}-%{release} +Requires: NetworkManager + +%description NetworkManager +This package contains the plugin to monitor network availability using +NetworkManager. + %package spamassassin Group: Applications/Productivity Summary: SpamAssassin plugin for Evolution @@ -382,9 +388,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/evolution/%{evo_base_version} # Modules: +# These must be listed individually because the NetworkManager +# module is split off into a separate NetworkManager subpackage. %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_base_version} -%{_libdir}/evolution/%{evo_base_version}/modules +%dir %{_libdir}/evolution/%{evo_base_version}/modules +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-addressbook.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-calendar.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so # Shared libraries: %{_libdir}/evolution/%{evo_base_version}/libcomposer.so.* @@ -557,6 +574,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas +%files NetworkManager +%defattr(-, root, root) +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-network-manager.so + %files spamassassin %defattr(-, root, root) %{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug @@ -575,6 +596,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Mar 11 2011 Matthew Barnes - 2.91.91-2 +- Split off an evolution-NetworkManager subpackage containing the NM + integration module. Users that choose to bypass NetworkManager can + uninstall this subpackage so Evolution doesn't insist it's offline. + * Mon Mar 07 2011 Milan Crha - 2.91.91-1 - Update to 2.91.91 From f48520a73b193503ba476f85d6eee683e7cecad9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 Mar 2011 12:30:07 -0400 Subject: [PATCH 11/20] Remove some BRs. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9887f21..728cb89 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 2.91.91 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -81,10 +81,8 @@ BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} -BuildRequires: gtkimageview-devel BuildRequires: intltool >= %{intltool_version} BuildRequires: libcanberra-devel -BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libpst-devel @@ -596,6 +594,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Mar 14 2011 Matthew Barnes - 2.91.91-3 +- Remove some unnecessary BuildRequires: + gtkimageview-devel: No release available for gtk3. + libgnomecanvas-devel: Evolution bundles its own libgnomecanvas now. + * Fri Mar 11 2011 Matthew Barnes - 2.91.91-2 - Split off an evolution-NetworkManager subpackage containing the NM integration module. Users that choose to bypass NetworkManager can From 0c13cd8f6de4bc28975248c06809e0b6ac74f866 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Mar 2011 17:53:07 +0100 Subject: [PATCH 12/20] Update to 2.91.92 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6c0b871..5cb70b9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.6.2.tar.bz2 /evolution-2.91.90.tar.bz2 /evolution-2.91.91.tar.bz2 +/evolution-2.91.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 728cb89..825e267 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 2.91.91 -Release: 3%{?dist} +Version: 2.91.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -594,6 +594,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Mar 21 2011 Milan Crha - 2.91.92-1 +- Update to 2.91.92 + * Mon Mar 14 2011 Matthew Barnes - 2.91.91-3 - Remove some unnecessary BuildRequires: gtkimageview-devel: No release available for gtk3. diff --git a/sources b/sources index bb22494..49570fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7fbbd81be9190749481c0b5eacc8755 evolution-2.91.91.tar.bz2 +5a95176673edbb970bd201c078632601 evolution-2.91.92.tar.bz2 From 80aa5b38f0911cbabe73aaf565b46030fb28cf7b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 25 Mar 2011 09:30:39 -0400 Subject: [PATCH 13/20] Rebuild against NM 0.9 --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 825e267..9e86506 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 2.91.92 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -594,6 +594,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Fri Mar 25 2011 Matthew Barnes - 2.91.92-2 +- Rebuild against NetworkManager 0.9. + * Mon Mar 21 2011 Milan Crha - 2.91.92-1 - Update to 2.91.92 From 419ff3a5d8193721b0b0084d8364fdfbc12cb3c3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Apr 2011 11:52:33 +0200 Subject: [PATCH 14/20] Update to 3.0.0 --- .gitignore | 1 + evolution.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5cb70b9..e479919 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.90.tar.bz2 /evolution-2.91.91.tar.bz2 /evolution-2.91.92.tar.bz2 +/evolution-3.0.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 9e86506..cc68cf9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,7 +4,7 @@ %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 %define gtk3_version 3.0.0 -%define gtkhtml_version 3.91.90 +%define gtkhtml_version 4.0.0 %define intltool_version 0.35.5 %define libgdata_version 0.7.0 %define libgweather_version 2.91.0 @@ -27,14 +27,14 @@ ### Abstract ### Name: evolution -Version: 2.91.92 -Release: 2%{?dist} +Version: 3.0.0 +Release: 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.91/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -378,7 +378,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/24x24/apps/* %{_datadir}/icons/hicolor/32x32/apps/* %{_datadir}/icons/hicolor/48x48/apps/* -%{_datadir}/icons/hicolor/scalable/apps/* +%{_datadir}/icons/hicolor/256x256/apps/* # The main data directory # (have not attempted to split this up into an explicit list) @@ -594,6 +594,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon Apr 04 2011 Milan Crha - 3.0.0-1 +- Update to 3.0.0 + * Fri Mar 25 2011 Matthew Barnes - 2.91.92-2 - Rebuild against NetworkManager 0.9. diff --git a/sources b/sources index 49570fa..4e6e5e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a95176673edbb970bd201c078632601 evolution-2.91.92.tar.bz2 +1ba663469e9d9bd6ed93b4b5960c939f evolution-3.0.0.tar.bz2 From 7c330a9da4556dce6c7065257569dc73834810c5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 26 Apr 2011 09:46:42 +0200 Subject: [PATCH 15/20] Update to 3.0.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e479919..3441e11 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.91.tar.bz2 /evolution-2.91.92.tar.bz2 /evolution-3.0.0.tar.bz2 +/evolution-3.0.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index cc68cf9..48e0065 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -594,6 +594,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Tue Apr 26 2011 Milan Crha - 3.0.1-1 +- Update to 3.0.1 + * Mon Apr 04 2011 Milan Crha - 3.0.0-1 - Update to 3.0.0 diff --git a/sources b/sources index 4e6e5e1..d636631 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ba663469e9d9bd6ed93b4b5960c939f evolution-3.0.0.tar.bz2 +23e12e4c29325610dfc04b2d10464b72 evolution-3.0.1.tar.bz2 From 33fb0cbe3a5d73ca547ec46b568e2c25c7155f97 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 23 May 2011 13:24:44 +0200 Subject: [PATCH 16/20] Update to 3.0.2 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3441e11..e122603 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.92.tar.bz2 /evolution-3.0.0.tar.bz2 /evolution-3.0.1.tar.bz2 +/evolution-3.0.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 48e0065..d627f16 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.0.1 +Version: 3.0.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -594,6 +594,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Mon May 23 2011 Milan Crha - 3.0.2-1 +- Update to 3.0.2 + * Tue Apr 26 2011 Milan Crha - 3.0.1-1 - Update to 3.0.1 diff --git a/sources b/sources index d636631..d3e3299 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23e12e4c29325610dfc04b2d10464b72 evolution-3.0.1.tar.bz2 +87f014736a6416e833e88de69df751ce evolution-3.0.2.tar.bz2 From c7aceeb20c978eb1372fc5707e3861d5976d5c3d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 2 Jun 2011 08:01:28 +0200 Subject: [PATCH 17/20] Add patch for Red Hat bug #707578 (crash on message fetching) --- evolution-3.0.2-rhbug707578.patch | 26 ++++++++++++++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 evolution-3.0.2-rhbug707578.patch diff --git a/evolution-3.0.2-rhbug707578.patch b/evolution-3.0.2-rhbug707578.patch new file mode 100644 index 0000000..1957f03 --- /dev/null +++ b/evolution-3.0.2-rhbug707578.patch @@ -0,0 +1,26 @@ +diff -up evolution-3.0.2/mail/mail-send-recv.c.rhbug707578 evolution-3.0.2/mail/mail-send-recv.c +--- evolution-3.0.2/mail/mail-send-recv.c.rhbug707578 2011-06-02 07:54:56.034531697 +0200 ++++ evolution-3.0.2/mail/mail-send-recv.c 2011-06-02 07:57:45.388735422 +0200 +@@ -924,6 +924,8 @@ refresh_folders_exec (struct _refresh_fo + + get_folders (m->store, m->folders, m->finfo); + ++ camel_operation_push_message (m->info->cancellable, _("Updating...")); ++ + for (i=0;ifolders->len;i++) { + folder = e_mail_session_uri_to_folder_sync ( + m->info->session, +@@ -944,9 +946,12 @@ refresh_folders_exec (struct _refresh_fo + break; + + if (m->info->state != SEND_CANCELLED) +- g_signal_emit_by_name (m->info->cancellable, "status", _("Updating..."), 100 * i / m->folders->len); ++ camel_operation_progress ( ++ m->info->cancellable, 100 * i / m->folders->len); + } + ++ camel_operation_pop_message (m->info->cancellable); ++ + if (cancellable) + g_signal_handler_disconnect (m->info->cancellable, handler_id); + } diff --git a/evolution.spec b/evolution.spec index d627f16..fa3ef29 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,6 +49,9 @@ Patch13: evolution-2.30.1-help-contents.patch Patch14: evolution-help-gl.patch +# RH bug #707578 +Patch15: evolution-3.0.2-rhbug707578.patch + ## Dependencies ### Requires(pre): GConf2 @@ -205,6 +208,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents %patch14 -p1 -b .help-gl +%patch15 -p1 -b .rhbug707578 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -594,6 +598,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Thu Jun 02 2011 Milan Crha - 3.0.2-2 +- Add patch for Red Hat bug #707578 (crash on message fetching) + * Mon May 23 2011 Milan Crha - 3.0.2-1 - Update to 3.0.2 From 1453ee62426287ddb475227f01ffb101cdf75944 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 22 Jun 2011 07:52:36 +0200 Subject: [PATCH 18/20] Add patch for Red Hat bug #714793 (pop3 receives messages twice) --- evolution-3.0.2-disconnect-pop3.patch | 23 +++++++++++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 evolution-3.0.2-disconnect-pop3.patch diff --git a/evolution-3.0.2-disconnect-pop3.patch b/evolution-3.0.2-disconnect-pop3.patch new file mode 100644 index 0000000..953c8b7 --- /dev/null +++ b/evolution-3.0.2-disconnect-pop3.patch @@ -0,0 +1,23 @@ +diff --git a/mail/mail-ops.c b/mail/mail-ops.c +index 79fce90..338e83f 100644 +--- a/mail/mail-ops.c ++++ b/mail/mail-ops.c +@@ -322,11 +322,18 @@ fetch_mail_exec (struct _fetch_mail_msg *m, + em_filter_folder_element_exec (fm, cancellable, error); + } + ++ g_object_ref (parent_store); ++ + /* we unref the source folder here since we + may now block in finalize (we try to + disconnect cleanly) */ + g_object_unref (fm->source_folder); + fm->source_folder = NULL; ++ ++ /* also disconnect if not a local delivery mbox; ++ there is no need to keep the connection alive forever */ ++ camel_service_disconnect_sync (CAMEL_SERVICE (parent_store), TRUE, NULL); ++ g_object_unref (parent_store); + } + } + fail: diff --git a/evolution.spec b/evolution.spec index fa3ef29..8be4f45 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -52,6 +52,9 @@ Patch14: evolution-help-gl.patch # RH bug #707578 Patch15: evolution-3.0.2-rhbug707578.patch +# RH bug #714793 +Patch16: evolution-3.0.2-disconnect-pop3.patch + ## Dependencies ### Requires(pre): GConf2 @@ -209,6 +212,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch13 -p1 -b .help-contents %patch14 -p1 -b .help-gl %patch15 -p1 -b .rhbug707578 +%patch16 -p1 -b .disconnect-pop3 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -598,6 +602,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Jun 22 2011 Milan Crha - 3.0.2-3 +- Add patch for Red Hat bug #714793 (pop3 receives messages twice) + * Thu Jun 02 2011 Milan Crha - 3.0.2-2 - Add patch for Red Hat bug #707578 (crash on message fetching) From 643efa687ce6fe4c3da7961d074b46b3a1cbac0a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 31 Aug 2011 13:36:42 +0200 Subject: [PATCH 19/20] Update to 3.0.3 --- .gitignore | 1 + evolution-3.0.2-disconnect-pop3.patch | 23 ----------------------- evolution-3.0.2-rhbug707578.patch | 26 -------------------------- evolution.spec | 17 +++++++---------- sources | 2 +- 5 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 evolution-3.0.2-disconnect-pop3.patch delete mode 100644 evolution-3.0.2-rhbug707578.patch diff --git a/.gitignore b/.gitignore index e122603..ef602fe 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.0.0.tar.bz2 /evolution-3.0.1.tar.bz2 /evolution-3.0.2.tar.bz2 +/evolution-3.0.3.tar.bz2 diff --git a/evolution-3.0.2-disconnect-pop3.patch b/evolution-3.0.2-disconnect-pop3.patch deleted file mode 100644 index 953c8b7..0000000 --- a/evolution-3.0.2-disconnect-pop3.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/mail/mail-ops.c b/mail/mail-ops.c -index 79fce90..338e83f 100644 ---- a/mail/mail-ops.c -+++ b/mail/mail-ops.c -@@ -322,11 +322,18 @@ fetch_mail_exec (struct _fetch_mail_msg *m, - em_filter_folder_element_exec (fm, cancellable, error); - } - -+ g_object_ref (parent_store); -+ - /* we unref the source folder here since we - may now block in finalize (we try to - disconnect cleanly) */ - g_object_unref (fm->source_folder); - fm->source_folder = NULL; -+ -+ /* also disconnect if not a local delivery mbox; -+ there is no need to keep the connection alive forever */ -+ camel_service_disconnect_sync (CAMEL_SERVICE (parent_store), TRUE, NULL); -+ g_object_unref (parent_store); - } - } - fail: diff --git a/evolution-3.0.2-rhbug707578.patch b/evolution-3.0.2-rhbug707578.patch deleted file mode 100644 index 1957f03..0000000 --- a/evolution-3.0.2-rhbug707578.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up evolution-3.0.2/mail/mail-send-recv.c.rhbug707578 evolution-3.0.2/mail/mail-send-recv.c ---- evolution-3.0.2/mail/mail-send-recv.c.rhbug707578 2011-06-02 07:54:56.034531697 +0200 -+++ evolution-3.0.2/mail/mail-send-recv.c 2011-06-02 07:57:45.388735422 +0200 -@@ -924,6 +924,8 @@ refresh_folders_exec (struct _refresh_fo - - get_folders (m->store, m->folders, m->finfo); - -+ camel_operation_push_message (m->info->cancellable, _("Updating...")); -+ - for (i=0;ifolders->len;i++) { - folder = e_mail_session_uri_to_folder_sync ( - m->info->session, -@@ -944,9 +946,12 @@ refresh_folders_exec (struct _refresh_fo - break; - - if (m->info->state != SEND_CANCELLED) -- g_signal_emit_by_name (m->info->cancellable, "status", _("Updating..."), 100 * i / m->folders->len); -+ camel_operation_progress ( -+ m->info->cancellable, 100 * i / m->folders->len); - } - -+ camel_operation_pop_message (m->info->cancellable); -+ - if (cancellable) - g_signal_handler_disconnect (m->info->cancellable, handler_id); - } diff --git a/evolution.spec b/evolution.spec index 8be4f45..f2b0c8f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.0.2 -Release: 3%{?dist} +Version: 3.0.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,12 +49,6 @@ Patch13: evolution-2.30.1-help-contents.patch Patch14: evolution-help-gl.patch -# RH bug #707578 -Patch15: evolution-3.0.2-rhbug707578.patch - -# RH bug #714793 -Patch16: evolution-3.0.2-disconnect-pop3.patch - ## Dependencies ### Requires(pre): GConf2 @@ -211,8 +205,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents %patch14 -p1 -b .help-gl -%patch15 -p1 -b .rhbug707578 -%patch16 -p1 -b .disconnect-pop3 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -602,6 +594,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Aug 31 2011 Milan Crha - 3.0.3-1 +- Update to 3.0.3 +- Remove patch for Red Hat bug #707578 (fixed upstream) +- Remove patch for Red Hat bug #714793 (fixed upstream) + * Wed Jun 22 2011 Milan Crha - 3.0.2-3 - Add patch for Red Hat bug #714793 (pop3 receives messages twice) diff --git a/sources b/sources index d3e3299..249efd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87f014736a6416e833e88de69df751ce evolution-3.0.2.tar.bz2 +49f2617445dc552a1527e5a33a7ad8b9 evolution-3.0.3.tar.bz2 From a8ddb02e4cacd72b50f6c03d082755e573ad9391 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 30 Nov 2011 07:34:36 -0600 Subject: [PATCH 20/20] CVE-2011-3201 --- evolution-3.0.3-CVE-2011-3201.patch | 56 +++++++++++++++++++++++++++++ evolution.spec | 9 ++++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 evolution-3.0.3-CVE-2011-3201.patch diff --git a/evolution-3.0.3-CVE-2011-3201.patch b/evolution-3.0.3-CVE-2011-3201.patch new file mode 100644 index 0000000..6ab1aab --- /dev/null +++ b/evolution-3.0.3-CVE-2011-3201.patch @@ -0,0 +1,56 @@ +diff -up evolution-3.0.3/composer/e-msg-composer.c.CVE-2011-3201 evolution-3.0.3/composer/e-msg-composer.c +--- evolution-3.0.3/composer/e-msg-composer.c.CVE-2011-3201 2011-07-15 02:42:06.000000000 -0500 ++++ evolution-3.0.3/composer/e-msg-composer.c 2011-11-30 07:32:33.485560137 -0600 +@@ -3893,6 +3893,35 @@ add_recipients (GList *list, const gchar + return list; + } + ++static const gchar *blacklist[] = { ".", "etc", ".." }; ++ ++static gboolean ++file_is_blacklisted (const gchar *filename) ++{ ++ gboolean blacklisted = FALSE; ++ guint ii, jj, n_parts; ++ gchar **parts; ++ ++ parts = g_strsplit (filename, G_DIR_SEPARATOR_S, -1); ++ n_parts = g_strv_length (parts); ++ ++ for (ii = 0; ii < G_N_ELEMENTS (blacklist); ii++) { ++ for (jj = 0; jj < n_parts; jj++) { ++ if (g_str_has_prefix (parts[jj], blacklist[ii])) { ++ blacklisted = TRUE; ++ break; ++ } ++ } ++ } ++ ++ g_strfreev (parts); ++ ++ if (blacklisted) ++ g_message ("Skipping suspicious attachment: %s", filename); ++ ++ return blacklisted; ++} ++ + static void + handle_mailto (EMsgComposer *composer, const gchar *mailto) + { +@@ -3985,6 +4014,8 @@ handle_mailto (EMsgComposer *composer, c + EAttachment *attachment; + + camel_url_decode (content); ++ if (file_is_blacklisted (content)) ++ goto next; + if (g_ascii_strncasecmp (content, "file:", 5) == 0) + attachment = e_attachment_new_for_uri (content); + else +@@ -4004,6 +4035,7 @@ handle_mailto (EMsgComposer *composer, c + e_msg_composer_add_header (composer, header, content); + } + ++next: + g_free (content); + + p += clen; diff --git a/evolution.spec b/evolution.spec index f2b0c8f..9bae3de 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,6 +49,9 @@ Patch13: evolution-2.30.1-help-contents.patch Patch14: evolution-help-gl.patch +# CVE-2011-3201 +Patch15: evolution-3.0.3-CVE-2011-3201.patch + ## Dependencies ### Requires(pre): GConf2 @@ -205,6 +208,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents %patch14 -p1 -b .help-gl +%patch15 -p1 -b .CVE-2011-3201 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -594,6 +598,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Nov 30 2011 Matthew Barnes - 3.0.3-2 +- Add patch for RH bug #757164 (CVE-2011-3201). + * Wed Aug 31 2011 Milan Crha - 3.0.3-1 - Update to 3.0.3 - Remove patch for Red Hat bug #707578 (fixed upstream)