- fixed assertion failed: (!g_thread_supported()) issue with newer glib

- rel. 5

Changed files:
    amanda-glib2.32.patch -> 1.2
    amanda.spec -> 1.223

diff --git a/amanda-glib2.32.patch b/amanda-glib2.32.patch
index 2108d85a8b7ef81ce50f84558cd997718fef53f5..5b9114bb3dce1b5c966acabffdf4c9f19261ae61 100644 (file)
--- 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 25d78009b3be4a639ed7829fb52b559d2869ef0f..2d13a03763150106fe884e1bc3577fadc0ce98c5 100644 (file)
--- 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