From 685ef2552e5e279f89de071c9f9b15c9c546672e Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Kie=C5=9B?= Date: Mon, 7 May 2012 15:29:16 +0000 Subject: [PATCH] - fixed assertion failed: (!g_thread_supported()) issue with newer glib - rel. 5 Changed files: amanda-glib2.32.patch -> 1.2 amanda.spec -> 1.223 --- amanda-glib2.32.patch | 13 +++++++++++++ amanda.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/amanda-glib2.32.patch b/amanda-glib2.32.patch index 2108d85..5b9114b 100644 --- a/amanda-glib2.32.patch +++ b/amanda-glib2.32.patch @@ -28,3 +28,16 @@ void g_ptr_array_free_full(GPtrArray * array); /* g_value_compare() does what you expect. It returns TRUE if and +--- amanda-3.2.3.old/common-src/glib-util.c 2012/03/10 13:43:52 ++++ amanda-3.2.3/common-src/glib-util.c 2012/05/07 17:25:35 +@@ -42,7 +42,9 @@ + * is initialized) */ + #ifdef HAVE_LIBCURL + # ifdef G_THREADS_ENABLED ++# if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 32)) + g_assert(!g_thread_supported()); /* assert threads aren't initialized yet */ ++# endif + # endif + g_assert(curl_global_init(CURL_GLOBAL_ALL) == 0); + #endif + diff --git a/amanda.spec b/amanda.spec index 25d7800..2d13a03 100644 --- a/amanda.spec +++ b/amanda.spec @@ -10,7 +10,7 @@ Summary: A network-capable tape backup solution Summary(pl.UTF-8): Sieciowo zorientowany system tworzenia kopii zapasowych Name: amanda Version: 3.2.3 -Release: 4 +Release: 5 License: BSD Group: Networking/Utilities Source0: http://downloads.sourceforge.net/amanda/%{name}-%{version}.tar.gz -- 2.44.0