Hello community, here is the log from the commit of package amanda for openSUSE:Factory checked in at Fri Feb 11 02:00:37 CET 2011. -------- --- amanda/amanda.changes 2010-08-30 18:59:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/amanda/amanda.changes 2011-02-10 00:58:44.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 10 00:39:46 CET 2011 - ro@suse.de + +- amanda-2.6.1p1-newer_glib.patch: + at least glib-2.27 brings g_list_free_full and g_slist_free_full + with own definitions, prefix local variant with my_ + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- amanda-2.6.1p1-newer_glib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amanda.spec ++++++ --- /var/tmp/diff_new_pack.twC99n/_old 2011-02-11 02:00:29.000000000 +0100 +++ /var/tmp/diff_new_pack.twC99n/_new 2011-02-11 02:00:29.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package amanda (Version 2.6.1.1) +# spec file for package amanda # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -27,7 +27,7 @@ BuildRequires: cups-libs gawk libsmbclient libsmbclient-devel libxslt mailx mtx readline-devel %define package_version 2.6.1p1 Version: 2.6.1.1 -Release: 10 +Release: 11 PreReq: pwdutils permissions Requires: dump /usr/bin/smbclient Requires: perl = %{perl_version} @@ -43,6 +43,7 @@ Patch1: %{name}-%{package_version}-pie.patch Patch3: %{name}-%{package_version}-shellbang.patch Patch4: %{name}-%{package_version}-return_val.patch +Patch5: %{name}-%{package_version}-newer_glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -71,6 +72,7 @@ %patch1 -p1 %patch3 %patch4 +%patch5 %build ./autogen ++++++ amanda-2.6.1p1-newer_glib.patch ++++++ --- common-src/conffile.c +++ common-src/conffile.c @@ -4151,7 +4151,7 @@ amfree(config_name); amfree(config_dir); - g_slist_free_full(seen_filenames); + my_g_slist_free_full(seen_filenames); seen_filenames = NULL; config_client = FALSE; @@ -5655,7 +5655,7 @@ break; case CONFTYPE_PP_SCRIPTLIST: - g_slist_free_full(val->v.pp_scriptlist); + my_g_slist_free_full(val->v.pp_scriptlist); break; case CONFTYPE_APPLICATION: @@ -6771,7 +6771,7 @@ void config_clear_errors(void) { - g_slist_free_full(cfgerr_errors); + my_g_slist_free_full(cfgerr_errors); cfgerr_errors = NULL; cfgerr_level = CFGERR_OK; --- common-src/glib-util.c +++ common-src/glib-util.c @@ -107,7 +107,7 @@ return to; } -void g_list_free_full(GList * list) { +void my_g_list_free_full(GList * list) { GList * cur = list; while (cur != NULL) { @@ -119,7 +119,7 @@ g_list_free(list); } -void g_slist_free_full(GSList * list) { +void my_g_slist_free_full(GSList * list) { GSList * cur = list; while (cur != NULL) { --- common-src/glib-util.h +++ common-src/glib-util.h @@ -64,8 +64,8 @@ /* 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_list_free_full(GList * list); -void g_slist_free_full(GSList * list); +void my_g_list_free_full(GList * list); +void my_g_slist_free_full(GSList * list); void g_queue_free_full(GQueue * queue); void g_ptr_array_free_full(GPtrArray * array); --- server-src/amadmin.c +++ server-src/amadmin.c @@ -1414,7 +1414,7 @@ amfree(dumpstr); dumpfile_free_data(&file); } - g_slist_free_full(file_list); + my_g_slist_free_full(file_list); break; case HOLDING_DELETE: @@ -1432,7 +1432,7 @@ error(_("Could not delete '%s'"), (char *)li->data); } } - g_slist_free_full(file_list); + my_g_slist_free_full(file_list); break; } } --- server-src/amflush.c +++ server-src/amflush.c @@ -241,7 +241,7 @@ stralloc((char *)datestamp->data), g_compare_strings); } - g_slist_free_full(all_datestamps); + my_g_slist_free_full(all_datestamps); } else { /* otherwise, in batch mode, use all datestamps */ @@ -390,9 +390,9 @@ } } - g_slist_free_full(datestamp_list); + my_g_slist_free_full(datestamp_list); datestamp_list = NULL; - g_slist_free_full(holding_list); + my_g_slist_free_full(holding_list); holding_list = NULL; if(redirect) { /* rename errfile */ @@ -583,7 +583,7 @@ } chupper = (char)toupper(ch); if (chupper < 'A' || chupper > max_char) { - g_slist_free_full(r_datestamp_list); + my_g_slist_free_full(r_datestamp_list); r_datestamp_list = NULL; break; } @@ -591,7 +591,7 @@ stralloc(datestamps[chupper - 'A'])); } while ((ch = *a++) != '\0'); if (r_datestamp_list && ch == '\0') { - g_slist_free_full(datestamp_list); + my_g_slist_free_full(datestamp_list); datestamp_list = r_datestamp_list; break; } --- server-src/cmdline.c +++ server-src/cmdline.c @@ -255,7 +255,7 @@ dumpfile_free_data(&file); } - g_slist_free_full(holding_files); + my_g_slist_free_full(holding_files); return matching_files; } --- server-src/cmdline.h +++ server-src/cmdline.h @@ -155,7 +155,7 @@ * the dumpspec list contains a dumpspec with all blank * entries, all holding files are returned. * - * Free the resulting list with g_slist_free_full() + * Free the resulting list with my_g_slist_free_full() * * @param dumpspec_list: a list of dumpspecs * @returns: a list of holding disk filenames. --- server-src/find.c +++ server-src/find.c @@ -257,7 +257,7 @@ dumpfile_free_data(&file); } - g_slist_free_full(holding_file_list); + my_g_slist_free_full(holding_file_list); } static char * --- server-src/holding.c +++ server-src/holding.c @@ -565,7 +565,7 @@ dumpfile_free_data(&file); } - if (file_list) g_slist_free_full(file_list); + if (file_list) my_g_slist_free_full(file_list); return result_list; } @@ -591,7 +591,7 @@ dumpfile_free_data(&dfile); } - g_slist_free_full(all_files); + my_g_slist_free_full(all_files); return datestamps; } --- server-src/planner.c +++ server-src/planner.c @@ -431,7 +431,7 @@ amfree(qhname); dumpfile_free_data(&file); } - g_slist_free_full(holding_list); + my_g_slist_free_full(holding_list); holding_list = NULL; } g_fprintf(stderr, _("ENDFLUSH\n")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org