From 9952392996d653e0d1dcd3dfd264a8188b835067 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Feb 2012 13:07:20 +0100 Subject: [PATCH 01/14] Update to 3.3.90 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5ef748e..85d1639 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ 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 diff --git a/evolution.spec b/evolution.spec index 427e728..b88c65a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.3.5 +Version: 3.3.90 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -600,6 +600,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 20 2012 Milan Crha - 3.3.90-1 +- Update to 3.3.90 + * Mon Feb 06 2012 Milan Crha - 3.3.5-1 - Update to 3.3.5 diff --git a/sources b/sources index 2d25dc1..154d09b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fb7309ab3c6371417f3ff009a26d43d evolution-3.3.5.tar.xz +38a195368667488e7fb30e7182f1999c evolution-3.3.90.tar.xz From 1c3664a42867075198e8e892e8e83a29270e81d3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Feb 2012 17:46:38 +0100 Subject: [PATCH 02/14] Shared libraries have been renamed --- evolution.spec | 79 ++++++++++++++++---------------------------------- 1 file changed, 25 insertions(+), 54 deletions(-) diff --git a/evolution.spec b/evolution.spec index b88c65a..056cd12 100644 --- a/evolution.spec +++ b/evolution.spec @@ -296,13 +296,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 {} \; @@ -410,31 +406,31 @@ 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}/libfilter.so +%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so +%{_libdir}/evolution/%{evo_base_version}/libmenus.so # Various libexec programs: %dir %{_libexecdir}/evolution @@ -546,31 +542,6 @@ 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 %files help -f help.lang %defattr(-, root, root) From c326539811250b4b34a6bbf3fb17d1c38ea70ea9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 6 Mar 2012 10:34:04 +0100 Subject: [PATCH 03/14] Update to 3.3.91 --- .gitignore | 1 + evolution.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85d1639..723d53e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.4.tar.xz /evolution-3.3.5.tar.xz /evolution-3.3.90.tar.xz +/evolution-3.3.91.tar.xz diff --git a/evolution.spec b/evolution.spec index 056cd12..d8d7404 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.3.90 +Version: 3.3.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -428,6 +428,7 @@ rm -rf $RPM_BUILD_ROOT %{_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 @@ -542,6 +543,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-shell-3.0.pc %{_libdir}/pkgconfig/libemail-engine.pc %{_libdir}/pkgconfig/libemail-utils.pc +%{_libdir}/pkgconfig/libevolution-utils.pc %files help -f help.lang %defattr(-, root, root) @@ -571,6 +573,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Mar 06 2012 Milan Crha - 3.3.91-1 +- Update to 3.3.91 + * Mon Feb 20 2012 Milan Crha - 3.3.90-1 - Update to 3.3.90 diff --git a/sources b/sources index 154d09b..bcc635b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38a195368667488e7fb30e7182f1999c evolution-3.3.90.tar.xz +51dd494e7824ae02776e7fc9d5ea541e evolution-3.3.91.tar.xz From c5e195dfc7a94d609b47677fe25f92c37dc548b0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Mar 2012 11:45:05 +0100 Subject: [PATCH 04/14] Update to 3.3.92 --- .gitignore | 1 + evolution.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 723d53e..b1c80b9 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.5.tar.xz /evolution-3.3.90.tar.xz /evolution-3.3.91.tar.xz +/evolution-3.3.92.tar.xz diff --git a/evolution.spec b/evolution.spec index d8d7404..ac4aa3d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,4 +1,3 @@ -%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 @@ -27,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.3.91 +Version: 3.3.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -67,7 +66,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 @@ -573,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 19 2012 Milan Crha - 3.3.92-1 +- Update to 3.3.92 + * Tue Mar 06 2012 Milan Crha - 3.3.91-1 - Update to 3.3.91 diff --git a/sources b/sources index bcc635b..dac4054 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51dd494e7824ae02776e7fc9d5ea541e evolution-3.3.91.tar.xz +93e36409a3f59822ab97fe7cbf3f7fc9 evolution-3.3.92.tar.xz From 2cd44598fef2d15f7a8cdbddff322d6828b36e72 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 26 Mar 2012 11:44:06 +0200 Subject: [PATCH 05/14] Update to 3.4.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b1c80b9..e80396e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.90.tar.xz /evolution-3.3.91.tar.xz /evolution-3.3.92.tar.xz +/evolution-3.4.0.tar.xz diff --git a/evolution.spec b/evolution.spec index ac4aa3d..ca16af8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,14 +26,14 @@ ### Abstract ### Name: evolution -Version: 3.3.92 +Version: 3.4.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}/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} @@ -572,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 26 2012 Milan Crha - 3.4.0-1 +- Update to 3.4.0 + * Mon Mar 19 2012 Milan Crha - 3.3.92-1 - Update to 3.3.92 diff --git a/sources b/sources index dac4054..db35c57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93e36409a3f59822ab97fe7cbf3f7fc9 evolution-3.3.92.tar.xz +ac3514457b5d20fefd9a6385e0b8cd92 evolution-3.4.0.tar.xz From 66f749e3e646f4859d5c3f9dd926f91622a926f7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 27 Mar 2012 18:41:28 +0200 Subject: [PATCH 06/14] Update to 3.4.0.1 --- .gitignore | 1 + evolution.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e80396e..788d8af 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ evolution-2.31.5.tar.bz2 /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 diff --git a/evolution.spec b/evolution.spec index ca16af8..c60cc13 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.4.0 +Version: 3.4.0.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -52,7 +52,7 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -Requires: evolution-data-server >= %{version} +Requires: evolution-data-server >= 3.4.0 Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs @@ -68,7 +68,7 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{version} +BuildRequires: evolution-data-server-devel >= 3.4.0 BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -128,7 +128,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 >= 3.4.0 Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -572,8 +572,8 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Mar 26 2012 Milan Crha - 3.4.0-1 -- Update to 3.4.0 +* Tue Mar 27 2012 Milan Crha - 3.4.0.1-1 +- Update to 3.4.0.1 * Mon Mar 19 2012 Milan Crha - 3.3.92-1 - Update to 3.3.92 diff --git a/sources b/sources index db35c57..8a58173 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac3514457b5d20fefd9a6385e0b8cd92 evolution-3.4.0.tar.xz +e439ee3b13615a266612cf769ff38c6a evolution-3.4.0.1.tar.xz From cf9af2c53f7e614b870bf7d1e4cb90d9c123b6ad Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 16 Apr 2012 09:05:14 +0100 Subject: [PATCH 07/14] Update to 3.4.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 788d8af..3cf7936 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ evolution-2.31.5.tar.bz2 /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 diff --git a/evolution.spec b/evolution.spec index c60cc13..24a5b3d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.4.0.1 +Version: 3.4.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -572,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Apr 16 2012 Richard Hughes - 3.4.1-1 +- Update to 3.4.1 + * Tue Mar 27 2012 Milan Crha - 3.4.0.1-1 - Update to 3.4.0.1 diff --git a/sources b/sources index 8a58173..d1b7cb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e439ee3b13615a266612cf769ff38c6a evolution-3.4.0.1.tar.xz +d178b6a9869f92e66b2022d4e35077ee evolution-3.4.1.tar.xz From 880bd9cd2aa91cf4d4ba922a8682c4e738307097 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Apr 2012 11:19:27 +0200 Subject: [PATCH 08/14] Fix incomplete .spec change done by Richard Hughes --- evolution.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 24a5b3d..b4f1ef9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -52,7 +52,7 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -Requires: evolution-data-server >= 3.4.0 +Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs @@ -68,7 +68,7 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= 3.4.0 +BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -128,7 +128,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= 3.4.0 +Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -572,7 +572,7 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Apr 16 2012 Richard Hughes - 3.4.1-1 +* Mon Apr 16 2012 Milan Crha - 3.4.1-1 - Update to 3.4.1 * Tue Mar 27 2012 Milan Crha - 3.4.0.1-1 From d22fa71be16f4f91381ab0ab5823bab33fbd13b9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 Apr 2012 20:29:56 +0300 Subject: [PATCH 09/14] Silence rpm scriptlet output 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 --- evolution.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index b4f1ef9..2b793dc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -329,14 +329,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 @@ -572,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Apr 24 2012 Kalev Lember - 3.4.1-2 +- Silence rpm scriptlet output + * Mon Apr 16 2012 Milan Crha - 3.4.1-1 - Update to 3.4.1 From d134c04bdd3be7f424b4f2ff13dfd65d47f66f70 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 May 2012 10:37:18 +0200 Subject: [PATCH 10/14] Update to 3.4.2 --- .gitignore | 1 + evolution.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3cf7936..683eca2 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ evolution-2.31.5.tar.bz2 /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 diff --git a/evolution.spec b/evolution.spec index 2b793dc..960ad8a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -3,7 +3,7 @@ %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.2 %define intltool_version 0.35.5 %define libgdata_version 0.10.0 %define libgweather_version 2.91.0 @@ -26,8 +26,8 @@ ### Abstract ### Name: evolution -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -572,6 +572,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 14 2012 Milan Crha - 3.4.2-1 +- Update to 3.4.2 +- Bump gtkhtml3 dependency to 4.4.2 + * Tue Apr 24 2012 Kalev Lember - 3.4.1-2 - Silence rpm scriptlet output diff --git a/sources b/sources index d1b7cb1..c1b200c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d178b6a9869f92e66b2022d4e35077ee evolution-3.4.1.tar.xz +e161138610416bfff07e6e0a1d9e4781 evolution-3.4.2.tar.xz From b23aad1e7ae481031bd60628d63fbbf902351fbb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Jun 2012 08:19:20 +0200 Subject: [PATCH 11/14] Update to 3.4.3 --- .gitignore | 1 + evolution.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 683eca2..1b9ce52 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ evolution-2.31.5.tar.bz2 /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 diff --git a/evolution.spec b/evolution.spec index 960ad8a..960e822 100644 --- a/evolution.spec +++ b/evolution.spec @@ -3,7 +3,7 @@ %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.4.2 +%define gtkhtml_version 4.4.3 %define intltool_version 0.35.5 %define libgdata_version 0.10.0 %define libgweather_version 2.91.0 @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.4.2 +Version: 3.4.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -572,6 +572,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 18 2012 Milan Crha - 3.4.3-1 +- Update to 3.4.3 +- Bump gtkhtml3 dependency to 4.4.3 + * Mon May 14 2012 Milan Crha - 3.4.2-1 - Update to 3.4.2 - Bump gtkhtml3 dependency to 4.4.2 diff --git a/sources b/sources index c1b200c..b9a58b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e161138610416bfff07e6e0a1d9e4781 evolution-3.4.2.tar.xz +11ee7f83fb88610a1e016937733c43bf evolution-3.4.3.tar.xz From 0f28833785a1722dad5335da89b77415caa3c8df Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 26 Jun 2012 17:01:23 +0200 Subject: [PATCH 12/14] Add patch for Red Hat bug #831128 (opens on wrong monitor) --- evolution-3.4.3-remember-monitor.patch | 33 ++++++++++++++++++++++++++ evolution.spec | 9 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 evolution-3.4.3-remember-monitor.patch diff --git a/evolution-3.4.3-remember-monitor.patch b/evolution-3.4.3-remember-monitor.patch new file mode 100644 index 0000000..ceeb935 --- /dev/null +++ b/evolution-3.4.3-remember-monitor.patch @@ -0,0 +1,33 @@ +diff --git a/e-util/e-util.c b/e-util/e-util.c +index f3b71c5..a579985 100644 +--- a/e-util/e-util.c ++++ b/e-util/e-util.c +@@ -351,6 +351,11 @@ e_restore_window (GtkWindow *window, + + if (g_settings_get_boolean (settings, "maximized")) { + GdkScreen *screen; ++ GdkRectangle monitor_area; ++ gint x, y, monitor; ++ ++ x = g_settings_get_int (settings, "x"); ++ y = g_settings_get_int (settings, "y"); + + screen = gtk_window_get_screen (window); + gtk_window_get_size (window, &width, &height); +@@ -358,10 +363,13 @@ e_restore_window (GtkWindow *window, + data->premax_width = width; + data->premax_height = height; + +- width = gdk_screen_get_width (screen); +- height = gdk_screen_get_height (screen); ++ monitor = gdk_screen_get_monitor_at_point (screen, x, y); ++ if (monitor < 0 || monitor >= gdk_screen_get_n_monitors (screen)) ++ monitor = 0; + +- gtk_window_resize (window, width, height); ++ gdk_screen_get_monitor_workarea (screen, monitor, &monitor_area); ++ ++ gtk_window_resize (window, monitor_area.width, monitor_area.height); + gtk_window_maximize (window); + } + } diff --git a/evolution.spec b/evolution.spec index 960e822..4c74efd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,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 #831128 +Patch03: evolution-3.4.3-remember-monitor.patch + ## Dependencies ### Requires(pre): GConf2 @@ -202,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 .remember-monitor mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -572,6 +576,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jun 26 2012 Milan Crha - 3.4.3-2 +- Add patch for Red Hat bug #831128 (opens on wrong monitor) + * Mon Jun 18 2012 Milan Crha - 3.4.3-1 - Update to 3.4.3 - Bump gtkhtml3 dependency to 4.4.3 From 3e4c57f3b8f043baa1213282cbf1cdfac663371c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Aug 2012 10:48:18 +0200 Subject: [PATCH 13/14] Update to 3.4.4 --- .gitignore | 1 + evolution-3.4.3-remember-monitor.patch | 33 -------------------------- evolution.spec | 12 +++++----- sources | 2 +- 4 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 evolution-3.4.3-remember-monitor.patch diff --git a/.gitignore b/.gitignore index 1b9ce52..fcab373 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.4.1.tar.xz /evolution-3.4.2.tar.xz /evolution-3.4.3.tar.xz +/evolution-3.4.4.tar.xz diff --git a/evolution-3.4.3-remember-monitor.patch b/evolution-3.4.3-remember-monitor.patch deleted file mode 100644 index ceeb935..0000000 --- a/evolution-3.4.3-remember-monitor.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/e-util/e-util.c b/e-util/e-util.c -index f3b71c5..a579985 100644 ---- a/e-util/e-util.c -+++ b/e-util/e-util.c -@@ -351,6 +351,11 @@ e_restore_window (GtkWindow *window, - - if (g_settings_get_boolean (settings, "maximized")) { - GdkScreen *screen; -+ GdkRectangle monitor_area; -+ gint x, y, monitor; -+ -+ x = g_settings_get_int (settings, "x"); -+ y = g_settings_get_int (settings, "y"); - - screen = gtk_window_get_screen (window); - gtk_window_get_size (window, &width, &height); -@@ -358,10 +363,13 @@ e_restore_window (GtkWindow *window, - data->premax_width = width; - data->premax_height = height; - -- width = gdk_screen_get_width (screen); -- height = gdk_screen_get_height (screen); -+ monitor = gdk_screen_get_monitor_at_point (screen, x, y); -+ if (monitor < 0 || monitor >= gdk_screen_get_n_monitors (screen)) -+ monitor = 0; - -- gtk_window_resize (window, width, height); -+ gdk_screen_get_monitor_workarea (screen, monitor, &monitor_area); -+ -+ gtk_window_resize (window, monitor_area.width, monitor_area.height); - gtk_window_maximize (window); - } - } diff --git a/evolution.spec b/evolution.spec index 4c74efd..f0b398f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,8 +26,8 @@ ### Abstract ### Name: evolution -Version: 3.4.3 -Release: 2%{?dist} +Version: 3.4.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,9 +46,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# RH bug #831128 -Patch03: evolution-3.4.3-remember-monitor.patch - ## Dependencies ### Requires(pre): GConf2 @@ -205,7 +202,6 @@ 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 .remember-monitor mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -576,6 +572,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 13 2012 Milan Crha - 3.4.4-1 +- Update to 3.4.4 +- Remove patch for Red Hat bug #831128 (fixed upstream) + * Tue Jun 26 2012 Milan Crha - 3.4.3-2 - Add patch for Red Hat bug #831128 (opens on wrong monitor) diff --git a/sources b/sources index b9a58b5..74a6597 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11ee7f83fb88610a1e016937733c43bf evolution-3.4.3.tar.xz +4b4d0a53edc498db53a1825b80593b91 evolution-3.4.4.tar.xz From 5573942bbad6deef54beecdf80877664ee471fdb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Sep 2012 15:37:04 +0200 Subject: [PATCH 14/14] Add patch for Red Hat bug #802310 (Crash under mail_mt_free_activity()) --- evolution-3.4.4-activity-free-crash.patch | 13 +++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 evolution-3.4.4-activity-free-crash.patch diff --git a/evolution-3.4.4-activity-free-crash.patch b/evolution-3.4.4-activity-free-crash.patch new file mode 100644 index 0000000..4acdafb --- /dev/null +++ b/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; diff --git a/evolution.spec b/evolution.spec index f0b398f..d5957a5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,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 @@ -202,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 @@ -572,6 +576,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 17 2012 Milan Crha - 3.4.4-2 +- Add patch for Red Hat bug #802310 (Crash under mail_mt_free_activity()) + * Mon Aug 13 2012 Milan Crha - 3.4.4-1 - Update to 3.4.4 - Remove patch for Red Hat bug #831128 (fixed upstream)