packages: amanda/amanda-glib2.32.patch, amanda/amanda.spec - fixed assertio...

[kiesiu]

Author: kiesiu                       Date: Mon May  7 15:29:21 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed assertion failed: (!g_thread_supported()) issue with newer glib
- rel. 5

---- Files affected:
packages/amanda:
   amanda-glib2.32.patch (1.1 -> 1.2) , amanda.spec (1.222 -> 1.223) 

---- Diffs:

================================================================
Index: packages/amanda/amanda-glib2.32.patch
diff -u packages/amanda/amanda-glib2.32.patch:1.1 packages/amanda/amanda-glib2.32.patch:1.2
--- packages/amanda/amanda-glib2.32.patch:1.1	Tue Apr  3 12:04:45 2012
+++ packages/amanda/amanda-glib2.32.patch	Mon May  7 17:29:16 2012
@@ -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
+

================================================================
Index: packages/amanda/amanda.spec
diff -u packages/amanda/amanda.spec:1.222 packages/amanda/amanda.spec:1.223
--- packages/amanda/amanda.spec:1.222	Tue Apr  3 12:04:45 2012
+++ packages/amanda/amanda.spec	Mon May  7 17:29:16 2012
@@ -11,7 +11,7 @@
 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
@@ -676,6 +676,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.223  2012/05/07 15:29:16  kiesiu
+- fixed assertion failed: (!g_thread_supported()) issue with newer glib
+- rel. 5
+
 Revision 1.222  2012/04/03 10:04:45  baggins
 - rel 4
 - fix building with glib2 2.32
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/amanda/amanda-glib2.32.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/amanda/amanda.spec?r1=1.222&r2=1.223