From 11b52874fc4180ce0a0eec842f726830937618bd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Nov 2011 09:22:33 +0100 Subject: [PATCH] Update to 3.3.2 --- .gitignore | 1 + evolution-ews-3.3.1-illegal-includes.patch | 12 -- evolution-ews-3.3.1-skip-g-thread-init.patch | 110 ------------------- evolution-ews.spec | 13 +-- sources | 2 +- 5 files changed, 8 insertions(+), 130 deletions(-) delete mode 100644 evolution-ews-3.3.1-illegal-includes.patch delete mode 100644 evolution-ews-3.3.1-skip-g-thread-init.patch diff --git a/.gitignore b/.gitignore index 945d515..a96f16b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /evolution-ews-3.3.1.tar.xz +/evolution-ews-3.3.2.tar.xz diff --git a/evolution-ews-3.3.1-illegal-includes.patch b/evolution-ews-3.3.1-illegal-includes.patch deleted file mode 100644 index af8b654..0000000 --- a/evolution-ews-3.3.1-illegal-includes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-ews-3.3.1/src/calendar/e-cal-backend-ews.c.illegal-includes evolution-ews-3.3.1/src/calendar/e-cal-backend-ews.c ---- evolution-ews-3.3.1/src/calendar/e-cal-backend-ews.c.illegal-includes 2011-11-09 09:59:06.977067092 -0500 -+++ evolution-ews-3.3.1/src/calendar/e-cal-backend-ews.c 2011-11-09 09:59:18.431933435 -0500 -@@ -40,8 +40,6 @@ - #include - #include - #include --#include --#include - #include - #include - #include diff --git a/evolution-ews-3.3.1-skip-g-thread-init.patch b/evolution-ews-3.3.1-skip-g-thread-init.patch deleted file mode 100644 index 4034859..0000000 --- a/evolution-ews-3.3.1-skip-g-thread-init.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -up evolution-ews-3.3.1/src/addressbook/e-book-backend-sqlitedb-test.c.skip-g-thread-init evolution-ews-3.3.1/src/addressbook/e-book-backend-sqlitedb-test.c ---- evolution-ews-3.3.1/src/addressbook/e-book-backend-sqlitedb-test.c.skip-g-thread-init 2011-11-09 10:41:20.188682319 -0500 -+++ evolution-ews-3.3.1/src/addressbook/e-book-backend-sqlitedb-test.c 2011-11-09 10:42:04.240214627 -0500 -@@ -194,7 +194,6 @@ gint - main (gint argc, gchar *argv[]) - { - g_type_init (); -- g_thread_init (NULL); - - if (argc != 2) { - g_print ("Please enter a path to store the cache \n"); -diff -up evolution-ews-3.3.1/src/addressbook/ews-oab-decoder.c.skip-g-thread-init evolution-ews-3.3.1/src/addressbook/ews-oab-decoder.c ---- evolution-ews-3.3.1/src/addressbook/ews-oab-decoder.c.skip-g-thread-init 2011-11-09 10:41:20.190682297 -0500 -+++ evolution-ews-3.3.1/src/addressbook/ews-oab-decoder.c 2011-11-09 10:42:07.567179322 -0500 -@@ -1018,7 +1018,6 @@ main (gint argc, gchar *argv []) - struct _db_data data; - - g_type_init (); -- g_thread_init (NULL); - - if (argc != 3) { - g_print ("Pass the oab filename and cache dir as argument \n"); -diff -up evolution-ews-3.3.1/src/addressbook/lzx/ews-oal-decompress.c.skip-g-thread-init evolution-ews-3.3.1/src/addressbook/lzx/ews-oal-decompress.c ---- evolution-ews-3.3.1/src/addressbook/lzx/ews-oal-decompress.c.skip-g-thread-init 2011-11-09 10:41:20.181682392 -0500 -+++ evolution-ews-3.3.1/src/addressbook/lzx/ews-oal-decompress.c 2011-11-09 10:42:02.381234354 -0500 -@@ -265,7 +265,6 @@ main (int argc, char *argv []) - } - - g_type_init (); -- g_thread_init (NULL); - - if (oal_decompress_v4_full_detail_file (argv [1], argv [2], NULL)) - g_print ("Successfully decompressed \n"); -diff -up evolution-ews-3.3.1/src/server/tests/test-autocompletion.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-autocompletion.c ---- evolution-ews-3.3.1/src/server/tests/test-autocompletion.c.skip-g-thread-init 2011-11-09 10:41:20.174682466 -0500 -+++ evolution-ews-3.3.1/src/server/tests/test-autocompletion.c 2011-11-09 10:41:52.574338442 -0500 -@@ -108,7 +108,6 @@ autocompletion_tests_run () - g_print ("Testing autocompletion... \n"); - - g_type_init (); -- g_thread_init (NULL); - - main_loop = g_main_loop_new (NULL, TRUE); - g_idle_add ((GSourceFunc) idle_cb, NULL); -diff -up evolution-ews-3.3.1/src/server/tests/test-connection.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-connection.c ---- evolution-ews-3.3.1/src/server/tests/test-connection.c.skip-g-thread-init 2011-11-09 10:41:20.170682509 -0500 -+++ evolution-ews-3.3.1/src/server/tests/test-connection.c 2011-11-09 10:41:48.338383406 -0500 -@@ -167,7 +167,6 @@ idle_cb (gpointer data) - void connection_tests_run () - { - g_type_init (); -- g_thread_init (NULL); - - main_loop = g_main_loop_new (NULL, TRUE); - g_idle_add ((GSourceFunc) idle_cb, NULL); -diff -up evolution-ews-3.3.1/src/server/tests/test-createfolder.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-createfolder.c ---- evolution-ews-3.3.1/src/server/tests/test-createfolder.c.skip-g-thread-init 2011-11-09 10:41:20.175682456 -0500 -+++ evolution-ews-3.3.1/src/server/tests/test-createfolder.c 2011-11-09 10:41:54.725315611 -0500 -@@ -101,7 +101,6 @@ void - createfolder_tests_run () - { - g_type_init (); -- g_thread_init (NULL); - - main_loop = g_main_loop_new (NULL, TRUE); - g_idle_add ((GSourceFunc) idle_cb, NULL); -diff -up evolution-ews-3.3.1/src/server/tests/test-cuditem.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-cuditem.c ---- evolution-ews-3.3.1/src/server/tests/test-cuditem.c.skip-g-thread-init 2011-11-09 10:41:20.178682425 -0500 -+++ evolution-ews-3.3.1/src/server/tests/test-cuditem.c 2011-11-09 10:41:58.687273559 -0500 -@@ -130,7 +130,6 @@ idle_cb (gpointer data) - void cuditem_tests_run () - { - g_type_init (); -- g_thread_init (NULL); - - main_loop = g_main_loop_new (NULL, TRUE); - g_idle_add ((GSourceFunc) idle_cb, NULL); -diff -up evolution-ews-3.3.1/src/server/tests/test-deletefolder.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-deletefolder.c ---- evolution-ews-3.3.1/src/server/tests/test-deletefolder.c.skip-g-thread-init 2011-11-09 10:41:20.177682436 -0500 -+++ evolution-ews-3.3.1/src/server/tests/test-deletefolder.c 2011-11-09 10:41:56.510296663 -0500 -@@ -96,7 +96,6 @@ deletefolder_tests_run (gconstpointer da - g_return_if_fail (*fid != NULL); - - g_type_init (); -- g_thread_init (NULL); - - main_loop = g_main_loop_new (NULL, TRUE); - g_idle_add ((GSourceFunc) idle_cb, fid); -diff -up evolution-ews-3.3.1/src/server/tests/test-getattachment.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-getattachment.c ---- evolution-ews-3.3.1/src/server/tests/test-getattachment.c.skip-g-thread-init 2011-11-09 10:41:20.172682487 -0500 -+++ evolution-ews-3.3.1/src/server/tests/test-getattachment.c 2011-11-09 10:41:50.606359331 -0500 -@@ -109,7 +109,6 @@ idle_cb (gpointer data) - void get_attachments_tests_run () - { - g_type_init (); -- g_thread_init (NULL); - - main_loop = g_main_loop_new (NULL, TRUE); - g_idle_add ((GSourceFunc) idle_cb, NULL); -diff -up evolution-ews-3.3.1/src/server/tests/test-syncfolder.c.skip-g-thread-init evolution-ews-3.3.1/src/server/tests/test-syncfolder.c ---- evolution-ews-3.3.1/src/server/tests/test-syncfolder.c.skip-g-thread-init 2011-11-09 10:41:20.180682403 -0500 -+++ evolution-ews-3.3.1/src/server/tests/test-syncfolder.c 2011-11-09 10:42:00.438254974 -0500 -@@ -245,7 +245,6 @@ void op_tests_run () - g_print ("Testing operations... \n"); - - g_type_init (); -- g_thread_init (NULL); - - main_loop = g_main_loop_new (NULL, TRUE); - g_idle_add ((GSourceFunc) idle_cb, NULL); diff --git a/evolution-ews.spec b/evolution-ews.spec index 0890e73..1d6cec0 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -1,13 +1,13 @@ %global evo_base_version 3.4 Name: evolution-ews -Version: 3.3.1 +Version: 3.3.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Evolution extension for Exchange Web Services License: LGPLv2 URL: http://projects.gnome.org/evolution -Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz BuildRequires: evolution-devel >= %{version} BuildRequires: evolution-data-server-devel >= %{version} @@ -15,8 +15,6 @@ BuildRequires: intltool # Build fixes Patch1: evolution-ews-3.3.1-enable-deprecated-glib-symbols.patch -Patch2: evolution-ews-3.3.1-illegal-includes.patch -Patch3: evolution-ews-3.3.1-skip-g-thread-init.patch %description This package allows Evolution to interact with Microsoft Exchange servers, @@ -25,8 +23,6 @@ versions 2007 and later, through its Exchange Web Services (EWS) interface. %prep %setup -q %patch1 -p1 -b .enable-deprecated-glib-symbols -%patch2 -p1 -b .illegal-includes -%patch3 -p1 -b .skip-g-thread-init %build %configure @@ -69,6 +65,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc %{_libdir}/liblzx.so.* %changelog +* Mon Nov 21 2011 Milan Crha - 3.3.2-1 +- Update to 3.3.2 +- Removed obsolete patches (fixed upstream) + * Wed Nov 07 2011 Matthew Barnes - 3.3.1-1 - Initial packaging for Fedora 17. - diff --git a/sources b/sources index 6b95fd1..e3984fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7f9a07bff9ba2ab8921319ba00e622b evolution-ews-3.3.1.tar.xz +95d4fd07c64ac091c86e987f5485c6e9 evolution-ews-3.3.2.tar.xz