[amanda/f17] Fix building issues with newer glib

[Lukáš Nykrýn]

commit 257a3a8fecb0a6270f219515a653063a43ee3460
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Wed Apr 18 12:21:57 2012 +0200

    Fix building issues with newer glib

 amanda-3.3.0-glib.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 amanda.spec             |    7 ++++++-
 2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/amanda-3.3.0-glib.patch b/amanda-3.3.0-glib.patch
new file mode 100644
index 0000000..f4c73ac
--- /dev/null
+++ b/amanda-3.3.0-glib.patch
@@ -0,0 +1,42 @@
+--- amanda/trunk/common-src/glib-util.c	2012/03/09 21:13:00	4591
++++ amanda/trunk/common-src/glib-util.c	2012/03/10 13:43:44	4592
+@@ -120,15 +120,6 @@
+ }
+ #endif
+ 
+-void g_queue_free_full(GQueue * queue) {
+-    while (!g_queue_is_empty(queue)) {
+-        gpointer data;
+-        data = g_queue_pop_head(queue);
+-        amfree(data);
+-    }
+-    g_queue_free(queue);
+-}
+-
+ void g_ptr_array_free_full(GPtrArray * array) {
+     size_t i;
+ 
+--- amanda/trunk/common-src/glib-util.h	2012/03/09 21:13:00	4591
++++ amanda/trunk/common-src/glib-util.h	2012/03/10 13:43:44	4592
+@@ -72,7 +72,6 @@
+ 
+ /* These functions all take a GLib container, and call free() on all the
+  * pointers in the container before free()ing the container itself. */
+-void g_queue_free_full(GQueue * queue);
+ void g_ptr_array_free_full(GPtrArray * array);
+ 
+ /* g_value_compare() does what you expect. It returns TRUE if and
+
+--- amanda/trunk/common-src/glib-util.c	2012/03/10 13:43:52	4593
++++ amanda/trunk/common-src/glib-util.c	2012/03/11 16:27:35	4594
+@@ -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 < 31))
+     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 6f07659..5bbb9d1 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -8,7 +8,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.3.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -19,6 +19,7 @@ Patch3: amanda-3.1.1-tcpport.patch
 Patch6: amanda-3.2.0-config-dir.patch
 Patch7: amanda-3.3.0-qw.patch
 Patch8: amanda-3.3.0-match_disk.patch
+Patch9: amanda-3.3.0-glib.patch
 License: BSD and GPLv3+ and GPLv2+ and GPLv2
 Group: Applications/System
 URL: http://www.amanda.org
@@ -84,6 +85,7 @@ server also needs to have the amanda-client package installed.
 %patch6 -p1 -b .config
 %patch7 -p3 -b .qw
 %patch8 -p3 -b .match_disk
+%patch9 -p2 -b .glib
 ./autogen
 
 %build
@@ -433,6 +435,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Apr 18 2012 Lukáš Nykrýn <lnykryn at redhat.com>> - 3.3.0-5
+- Fix building issues with newer glib
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild