Author: baggins Date: Tue Apr 3 10:04:50 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 4 - fix building with glib2 2.32
---- Files affected: packages/amanda: amanda.spec (1.221 -> 1.222) , amanda-glib2.32.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/amanda/amanda.spec diff -u packages/amanda/amanda.spec:1.221 packages/amanda/amanda.spec:1.222 --- packages/amanda/amanda.spec:1.221 Fri Mar 30 17:28:53 2012 +++ packages/amanda/amanda.spec Tue Apr 3 12:04:45 2012 @@ -11,7 +11,7 @@ Summary(pl.UTF-8): Sieciowo zorientowany system tworzenia kopii zapasowych Name: amanda Version: 3.2.3 -Release: 3 +Release: 4 License: BSD Group: Networking/Utilities Source0: http://downloads.sourceforge.net/amanda/%{name}-%{version}.tar.gz @@ -37,6 +37,7 @@ Patch10: %{name}-amstar-exclude.patch Patch11: %{name}-amstar-exclude-fix.patch Patch12: %{name}-krb5-auth.patch +Patch13: %{name}-glib2.32.patch URL: http://www.amanda.org/ BuildRequires: autoconf >= 2.53 BuildRequires: automake @@ -209,6 +210,7 @@ %patch10 -p2 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %build %{__aclocal} -I config -I config/gettext-macros -I config/gnulib -I config/amanda -I config/macro-archive @@ -674,6 +676,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.222 2012/04/03 10:04:45 baggins +- rel 4 +- fix building with glib2 2.32 + Revision 1.221 2012/03/30 15:28:53 arekm - release 3 ================================================================ Index: packages/amanda/amanda-glib2.32.patch diff -u /dev/null packages/amanda/amanda-glib2.32.patch:1.1 --- /dev/null Tue Apr 3 12:04:50 2012 +++ packages/amanda/amanda-glib2.32.patch Tue Apr 3 12:04:45 2012 @@ -0,0 +1,30 @@ +--- amanda-3.2.3/common-src/glib-util.c~ 2010-12-08 23:09:29.000000000 +0100 ++++ amanda-3.2.3/common-src/glib-util.c 2012-04-03 12:02:32.801046078 +0200 +@@ -120,6 +120,7 @@ + } + #endif + ++#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 32)) + void g_queue_free_full(GQueue * queue) { + while (!g_queue_is_empty(queue)) { + gpointer data; +@@ -128,6 +129,7 @@ + } + g_queue_free(queue); + } ++#endif + + void g_ptr_array_free_full(GPtrArray * array) { + size_t i; +--- amanda-3.2.3/common-src/glib-util.h~ 2010-12-08 23:09:29.000000000 +0100 ++++ amanda-3.2.3/common-src/glib-util.h 2012-04-03 12:03:14.514381294 +0200 +@@ -72,7 +72,9 @@ + + /* These functions all take a GLib container, and call free() on all the + * pointers in the container before free()ing the container itself. */ ++#if (GLIB_MAJOR_VERSION < 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 32)) + void g_queue_free_full(GQueue * queue); ++#endif + void g_ptr_array_free_full(GPtrArray * array); + + /* g_value_compare() does what you expect. It returns TRUE if and ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/amanda/amanda.spec?r1=1.221&r2=1.222 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
