Add patch for Red Hat bug #802310 (Crash under mail_mt_free_activity())

Redirect it to /dev/null; end users aren't supposed to see the warnings
generated by e.g. glib-compile-schemas.

http://fedoraproject.org/wiki/Packaging:ScriptletSnippets

.gitignore

@@ -28,3 +28,12 @@ evolution-2.31.5.tar.bz2
 /evolution-3.3.3.tar.xz
 /evolution-3.3.4.tar.xz
 /evolution-3.3.5.tar.xz
+/evolution-3.3.90.tar.xz
+/evolution-3.3.91.tar.xz
+/evolution-3.3.92.tar.xz
+/evolution-3.4.0.tar.xz
+/evolution-3.4.0.1.tar.xz
+/evolution-3.4.1.tar.xz
+/evolution-3.4.2.tar.xz
+/evolution-3.4.3.tar.xz
+/evolution-3.4.4.tar.xz

evolution-3.4.4-activity-free-crash.patch

@@ -0,0 +1,13 @@
+diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
+index f0632a4..0f1ca47 100644
+--- a/libemail-engine/mail-ops.c
++++ b/libemail-engine/mail-ops.c
+@@ -1051,7 +1051,7 @@ mail_send_queue (EMailSession *session,
+ 	m->queue = g_object_ref (queue);
+ 	m->transport = g_object_ref (transport);
+ 	if (G_IS_CANCELLABLE (cancellable))
+-		m->base.cancellable = cancellable;
++		m->base.cancellable = g_object_ref (cancellable);
+ 	m->status = status;
+ 	m->status_data = status_data;
+ 	m->done = done;

evolution.spec

@@ -1,10 +1,9 @@
-%define dbus_version 1.0
 %define glib2_version 2.30.0
 %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 3.2.0
-%define gtkhtml_version 4.3.1
+%define gtkhtml_version 4.4.3
 %define intltool_version 0.35.5
 %define libgdata_version 0.10.0
 %define libgweather_version 2.91.0
@@ -27,14 +26,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.3.5
-Release: 1%{?dist}
+Version: 3.4.4
+Release: 2%{?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}/3.3/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz
 
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -47,6 +46,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
+# RH bug #802310
+Patch03: evolution-3.4.4-activity-free-crash.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -67,7 +69,7 @@ BuildRequires: automake >= 1.9
 BuildRequires: bison
 BuildRequires: cairo-gobject-devel
 BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version}
-BuildRequires: dbus-devel >= %{dbus_version}
+BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: evolution-data-server-devel >= %{version}
 BuildRequires: gettext
@@ -203,6 +205,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %setup -q -n evolution-%{version}
 %patch01 -p1 -b .ldaphack
 %patch02 -p1 -b .help-contents
+%patch03 -p1 -b .activity-free-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -296,13 +299,9 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # remove libtool archives for importers and the like
 find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \;
-find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-engine.la' -exec rm {} \;
-find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-utils.la' -exec rm {} \;
 
 # remove statically built libraries:
 find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \;
-find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-engine.a' -exec rm {} \;
-find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-utils.a' -exec rm {} \;
 
 # remove old GConf schemas
 find $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas -name '*.schemas' -exec rm {} \;
@@ -334,14 +333,14 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
     gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-    glib-compile-schemas %{_datadir}/glib-2.0/schemas
+    glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -410,31 +409,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so
 
 # Shared libraries:
-%{_libdir}/libemail-engine.so.*
-%{_libdir}/libemail-utils.so.*
-%{_libdir}/evolution/%{evo_base_version}/libcomposer.so.*
-%{_libdir}/evolution/%{evo_base_version}/libeabutil.so.*
-%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so.*
-%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so.*
-%{_libdir}/evolution/%{evo_base_version}/libemformat.so.*
-%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so.*
-%{_libdir}/evolution/%{evo_base_version}/libeshell.so.*
-%{_libdir}/evolution/%{evo_base_version}/libessmime.so.*
-%{_libdir}/evolution/%{evo_base_version}/libetable.so.*
-%{_libdir}/evolution/%{evo_base_version}/libetext.so.*
-%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so.*
-%{_libdir}/evolution/%{evo_base_version}/libeutil.so.*
-%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so.*
-%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so.*
-%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so.*
-%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so.*
-%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so.*
-%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so.*
-%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.*
-%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.*
-%{_libdir}/evolution/%{evo_base_version}/libfilter.so.*
-%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so.*
-%{_libdir}/evolution/%{evo_base_version}/libmenus.so.*
+%{_libdir}/evolution/%{evo_base_version}/libcomposer.so
+%{_libdir}/evolution/%{evo_base_version}/libeabutil.so
+%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so
+%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so
+%{_libdir}/evolution/%{evo_base_version}/libemail-engine.so
+%{_libdir}/evolution/%{evo_base_version}/libemail-utils.so
+%{_libdir}/evolution/%{evo_base_version}/libemformat.so
+%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so
+%{_libdir}/evolution/%{evo_base_version}/libeshell.so
+%{_libdir}/evolution/%{evo_base_version}/libessmime.so
+%{_libdir}/evolution/%{evo_base_version}/libetable.so
+%{_libdir}/evolution/%{evo_base_version}/libetext.so
+%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so
+%{_libdir}/evolution/%{evo_base_version}/libeutil.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so
+%{_libdir}/evolution/%{evo_base_version}/libevolution-utils.so
+%{_libdir}/evolution/%{evo_base_version}/libfilter.so
+%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so
+%{_libdir}/evolution/%{evo_base_version}/libmenus.so
 
 # Various libexec programs:
 %dir %{_libexecdir}/evolution
@@ -546,31 +546,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/evolution-shell-3.0.pc
 %{_libdir}/pkgconfig/libemail-engine.pc
 %{_libdir}/pkgconfig/libemail-utils.pc
-%{_libdir}/libemail-engine.so
-%{_libdir}/libemail-utils.so
-%{_libdir}/evolution/%{evo_base_version}/libcomposer.so
-%{_libdir}/evolution/%{evo_base_version}/libeabutil.so
-%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so
-%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so
-%{_libdir}/evolution/%{evo_base_version}/libemformat.so
-%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so
-%{_libdir}/evolution/%{evo_base_version}/libeshell.so
-%{_libdir}/evolution/%{evo_base_version}/libessmime.so
-%{_libdir}/evolution/%{evo_base_version}/libetable.so
-%{_libdir}/evolution/%{evo_base_version}/libetext.so
-%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so
-%{_libdir}/evolution/%{evo_base_version}/libeutil.so
-%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so
-%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so
-%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so
-%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so
-%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so
-%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so
-%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so
-%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so
-%{_libdir}/evolution/%{evo_base_version}/libfilter.so
-%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so
-%{_libdir}/evolution/%{evo_base_version}/libmenus.so
+%{_libdir}/pkgconfig/libevolution-utils.pc
 
 %files help -f help.lang
 %defattr(-, root, root)
@@ -600,6 +576,42 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 17 2012 Milan Crha <mcrha@redhat.com> - 3.4.4-2
+- Add patch for Red Hat bug #802310 (Crash under mail_mt_free_activity())
+
+* Mon Aug 13 2012 Milan Crha <mcrha@redhat.com> - 3.4.4-1
+- Update to 3.4.4
+- Remove patch for Red Hat bug #831128 (fixed upstream)
+
+* Tue Jun 26 2012 Milan Crha <mcrha@redhat.com> - 3.4.3-2
+- Add patch for Red Hat bug #831128 (opens on wrong monitor)
+
+* Mon Jun 18 2012 Milan Crha <mcrha@redhat.com> - 3.4.3-1
+- Update to 3.4.3
+- Bump gtkhtml3 dependency to 4.4.3
+
+* Mon May 14 2012 Milan Crha <mcrha@redhat.com> - 3.4.2-1
+- Update to 3.4.2
+- Bump gtkhtml3 dependency to 4.4.2
+
+* Tue Apr 24 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.1-2
+- Silence rpm scriptlet output
+
+* Mon Apr 16 2012 Milan Crha <mcrha@redhat.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Tue Mar 27 2012 Milan Crha <mcrha@redhat.com> - 3.4.0.1-1
+- Update to 3.4.0.1
+
+* Mon Mar 19 2012 Milan Crha <mcrha@redhat.com> - 3.3.92-1
+- Update to 3.3.92
+
+* Tue Mar 06 2012 Milan Crha <mcrha@redhat.com> - 3.3.91-1
+- Update to 3.3.91
+
+* Mon Feb 20 2012 Milan Crha <mcrha@redhat.com> - 3.3.90-1
+- Update to 3.3.90
+
 * Mon Feb 06 2012 Milan Crha <mcrha@redhat.com> - 3.3.5-1
 - Update to 3.3.5
 

sources

@@ -1 +1 @@
-7fb7309ab3c6371417f3ff009a26d43d  evolution-3.3.5.tar.xz
+4b4d0a53edc498db53a1825b80593b91  evolution-3.4.4.tar.xz