diff --git a/.gitignore b/.gitignore index 11a87be..3544576 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ evolution-data-server-2.31.5.tar.bz2 /evolution-data-server-3.1.92.tar.xz /evolution-data-server-3.2.0.tar.xz /evolution-data-server-3.3.1.tar.xz +/evolution-data-server-3.3.2.tar.xz diff --git a/evolution-data-server-3.3.1-no-g-thread-init.patch b/evolution-data-server-3.3.1-no-g-thread-init.patch deleted file mode 100644 index a265339..0000000 --- a/evolution-data-server-3.3.1-no-g-thread-init.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb-test.c b/addressbook/libedata-book/e-book-backend-sqlitedb-test.c -index df39af2..e887abb 100644 ---- a/addressbook/libedata-book/e-book-backend-sqlitedb-test.c -+++ b/addressbook/libedata-book/e-book-backend-sqlitedb-test.c -@@ -197,7 +197,9 @@ main (gint argc, - gchar *argv[]) - { - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - if (argc != 2) { - g_print ("Please enter a path to store the cache \n"); -diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c -index ba1fcf0..b2bee69 100644 ---- a/calendar/backends/file/e-cal-backend-file.c -+++ b/calendar/backends/file/e-cal-backend-file.c -@@ -3800,7 +3800,9 @@ main (gint argc, - FILE * fin = NULL; - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - context = g_option_context_new ("- test utility for e-d-s file backend"); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c -index 87ae760..89ed82e 100644 ---- a/camel/camel-index-control.c -+++ b/camel/camel-index-control.c -@@ -127,7 +127,9 @@ gint main (gint argc, gchar **argv) - if (argc < 2) - do_usage (argv[0]); - -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - camel_init (NULL, 0); - - if (!strcmp(argv[1], "compress")) -diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c -index 563a332..f5b69fe 100644 ---- a/camel/camel-text-index.c -+++ b/camel/camel-text-index.c -@@ -1862,7 +1862,9 @@ main (gint argc, - - printf ("Camel text index tester!\n"); - -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - camel_init (NULL, 0); - - idx = (CamelIndex *)camel_text_index_new ("textindex", O_CREAT|O_RDWR|O_TRUNC); -diff --git a/camel/providers/imapx/test-imapx.c b/camel/providers/imapx/test-imapx.c -index fe71d1c..de9a455 100644 ---- a/camel/providers/imapx/test-imapx.c -+++ b/camel/providers/imapx/test-imapx.c -@@ -36,7 +36,9 @@ main (gint argc, - } - - uri = argv[1]; -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - system ("rm -rf /tmp/test-camel-imapx"); - camel_init ("/tmp/test-camel-imapx", TRUE); - camel_provider_init (); -diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c -index 16caf79..743c658 100644 ---- a/camel/tests/lib/camel-test.c -+++ b/camel/tests/lib/camel-test.c -@@ -103,8 +103,10 @@ camel_test_init (gint argc, - setup = 1; - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - /* yeah, we do need ot thread init, even though camel isn't compiled with enable threads */ - g_thread_init (NULL); -+ #endif - - path = g_strdup_printf ("/tmp/camel-test"); - if (mkdir (path, 0700) == -1 && errno != EEXIST) -diff --git a/tests/libebook/client/client-test-utils.c b/tests/libebook/client/client-test-utils.c -index 710ba25..f778333 100644 ---- a/tests/libebook/client/client-test-utils.c -+++ b/tests/libebook/client/client-test-utils.c -@@ -67,7 +67,9 @@ main_initialize (void) - return; - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - initialized = TRUE; - } -diff --git a/tests/libecal/client/client-test-utils.c b/tests/libecal/client/client-test-utils.c -index c6f7062..a39c994 100644 ---- a/tests/libecal/client/client-test-utils.c -+++ b/tests/libecal/client/client-test-utils.c -@@ -63,7 +63,9 @@ main_initialize (void) - return; - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - initialized = TRUE; - } -diff --git a/tests/libedataserverui/test-client-examine-auth.c b/tests/libedataserverui/test-client-examine-auth.c -index a02fb04..e94e33b 100644 ---- a/tests/libedataserverui/test-client-examine-auth.c -+++ b/tests/libedataserverui/test-client-examine-auth.c -@@ -413,7 +413,9 @@ main (gint argc, - gchar **argv) - { - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - gtk_init (&argc, &argv); - - e_passwords_init (); -diff --git a/tests/libedataserverui/test-name-selector.c b/tests/libedataserverui/test-name-selector.c -index 3173382..bab8e4c 100644 ---- a/tests/libedataserverui/test-name-selector.c -+++ b/tests/libedataserverui/test-name-selector.c -@@ -81,7 +81,9 @@ main (gint argc, - gchar **argv) - { - gtk_init (&argc, &argv); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - camel_init (NULL, 0); - diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 254c567..7e38f64 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -24,7 +24,7 @@ ### Abstract ### Name: evolution-data-server -Version: 3.3.1 +Version: 3.3.2 Release: 1%{?dist} Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -40,7 +40,6 @@ Obsoletes: evolution-webcal < 2.24.0 # RH bug #243296 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch -Patch02: evolution-data-server-3.3.1-no-g-thread-init.patch ### Build Dependencies ### @@ -121,7 +120,6 @@ This package contains developer documentation for %{name}. %setup -q %patch01 -p1 -b .fix-64bit-acinclude -%patch02 -p1 -b .no-g-thread-init mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -342,6 +340,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Mon Nov 21 2011 Milan Crha - 3.3.2-1 +- Update to 3.3.2 +- Remove patch to not call g_thread_init() (fixed upstream) + * Mon Oct 24 2011 Milan Crha - 3.3.1-1 - Update to 3.3.1 - Add patch to not call g_thread_init() diff --git a/sources b/sources index 7da2a44..1f8a0bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d30dc89327db61d059148c5b2e709c6b evolution-data-server-3.3.1.tar.xz +fc8554cda69dae080c76a58008d1d630 evolution-data-server-3.3.2.tar.xz