Mailinglist Archive: opensuse-commit (1737 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package amanda for openSUSE:Factory checked 
in at 2012-02-10 17:11:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amanda (Old)
 and      /work/SRC/openSUSE:Factory/.amanda.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "amanda", Maintainer is "JMatejek@xxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/amanda/amanda.changes    2011-12-08 
11:48:05.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.amanda.new/amanda.changes       2012-02-10 
17:11:10.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb  7 17:41:09 UTC 2012 - jmatejek@xxxxxxxx
+
+- removed custom definition of g_queue_free_full which was
+  conflicting with a function newly added to glib2
+
+-------------------------------------------------------------------

New:
----
  amanda-3.3.0-g_queue.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ amanda.spec ++++++
--- /var/tmp/diff_new_pack.Q5QKab/_old  2012-02-10 17:11:12.000000000 +0100
+++ /var/tmp/diff_new_pack.Q5QKab/_new  2012-02-10 17:11:12.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package amanda
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,6 +14,9 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
+
+
+#
 %if 0%{?suse_version} <= 1110
     %define amanda_group disk
 %else
@@ -60,6 +63,7 @@
 Patch3:         amanda-2.6.1p1-shellbang.patch
 Patch4:         amanda-2.6.1p1-return_val.patch
 Patch6:         amanda-2.6.1p1-avoid-perl-provides.patch
+Patch7:         amanda-3.3.0-g_queue.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -69,9 +73,11 @@
 
 %prep
 %setup -q -a 1 -a 2
+rm -r patches
 %patch3
 %patch4
 %patch6 -p1
+%patch7 -p1
 
 %build
 ./autogen

++++++ amanda-3.3.0-g_queue.patch ++++++
Index: amanda-3.3.0/common-src/glib-util.c
===================================================================
--- amanda-3.3.0.orig/common-src/glib-util.c    2011-03-30 20:45:37.000000000 
+0200
+++ amanda-3.3.0/common-src/glib-util.c 2012-02-02 15:41:35.000000000 +0100
@@ -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;
 
Index: amanda-3.3.0/common-src/glib-util.h
===================================================================
--- amanda-3.3.0.orig/common-src/glib-util.h    2011-03-30 20:45:37.000000000 
+0200
+++ amanda-3.3.0/common-src/glib-util.h 2012-02-02 15:53:37.000000000 +0100
@@ -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
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx