Hello community, here is the log from the commit of package gnome-media checked in at Sat Apr 8 01:59:16 CEST 2006. -------- --- GNOME/gnome-media/gnome-media.changes 2006-03-30 20:39:18.000000000 +0200 +++ gnome-media/gnome-media.changes 2006-04-03 22:24:13.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 3 22:23:11 CEST 2006 - jpr@suse.de + +- Update to 2.14.0, the only upstream change being for gstreamer 0.10 +support +- Back patch to remove goption requirement so we don't need a new +libbonobo/libgnomeui + +------------------------------------------------------------------- Old: ---- gnome-media-2.12.0.tar.bz2 grecord-random.patch New: ---- gnome-cd-args.patch gnome-media-2.14.0.tar.bz2 gnome-media-configure-args.patch grecord-args.patch gst-mixer-args.patch gstreamer-properties-args.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-media.spec ++++++ --- /var/tmp/diff_new_pack.4HeHFW/_old 2006-04-08 01:58:54.000000000 +0200 +++ /var/tmp/diff_new_pack.4HeHFW/_new 2006-04-08 01:58:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-media (Version 2.12.0) +# spec file for package gnome-media (Version 2.14.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,18 +12,18 @@ Name: gnome-media %define DISTRIBUTABLE 1 -BuildRequires: docbook-utils gail-devel gnome-desktop-devel gnutls-devel gstreamer-plugins-default gstreamer-plugins-devel intltool kdelibs3-doc libcddb-devel libglade2-devel libgnomeprintui-devel libidl-devel libwnck-devel mDNSResponder-devel nautilus-cd-burner-devel perl-XML-Parser scrollkeeper update-desktop-files +BuildRequires: docbook-utils gail-devel gnome-common gnome-desktop-devel gnutls-devel gstreamer010-plugins-base-devel gstreamer010-plugins-good intltool kdelibs3-doc libcddb-devel libglade2-devel libgnomeprintui-devel libidl-devel libwnck-devel mDNSResponder-devel nautilus-cd-burner-devel perl-XML-Parser scrollkeeper update-desktop-files %define prefix /opt/gnome %define sysconfdir /etc%{prefix} License: GPL Group: System/GUI/GNOME -Requires: control-center2 gstreamer-plugins-default +Requires: control-center2 gstreamer010-plugins-good Requires: sox dbus-1 hal Provides: gnome-media2 Obsoletes: gnome-media2 Autoreqprov: on -Version: 2.12.0 -Release: 17 +Version: 2.14.0 +Release: 2 Summary: GNOME Multimedia (Media) Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.6/%{name}-%{version}.tar.bz2 Patch: gnome-media-void.patch @@ -31,8 +31,12 @@ Patch3: %name-desktop.patch Patch4: %name-64bit.patch Patch5: grecord-missing-icon.patch -Patch6: grecord-random.patch Patch7: gnome-media-lame.patch +Patch8: gnome-media-configure-args.patch +Patch9: grecord-args.patch +Patch10: gnome-cd-args.patch +Patch11: gst-mixer-args.patch +Patch12: gstreamer-properties-args.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Docdir: %{_defaultdocdir} @@ -107,10 +111,14 @@ %patch3 -p1 %patch4 %patch5 -%patch6 %if ! %DISTRIBUTABLE %patch7 %endif +%patch8 +%patch9 +%patch10 +%patch11 +%patch12 %build rename no nb po/no.* @@ -119,6 +127,7 @@ sed "s/(ALL_LINGUAS.*) no /\1 nb /" configure.in > configure.in.tmp && \ mv configure.in.tmp configure.in libtoolize -f +intltoolize --force --copy aclocal -I ./m4 autoconf automake @@ -238,6 +247,11 @@ %{sysconfdir}/gconf/schemas/gnome-cd.schemas %changelog -n gnome-media +* Mon Apr 03 2006 - jpr@suse.de +- Update to 2.14.0, the only upstream change being for gstreamer 0.10 + support +- Back patch to remove goption requirement so we don't need a new + libbonobo/libgnomeui * Thu Mar 30 2006 - gekker@suse.de - Split out gnome-cd to subpackage gnome-media-cd (#161585) * Wed Mar 22 2006 - sbrabec@suse.cz ++++++ gnome-cd-args.patch ++++++ Index: gnome-cd/gnome-cd.c =================================================================== RCS file: /cvs/gnome/gnome-media/gnome-cd/gnome-cd.c,v retrieving revision 1.105 retrieving revision 1.104 diff -u -r1.105 -r1.104 --- gnome-cd/gnome-cd.c 10 Feb 2006 12:45:00 -0000 1.105 +++ gnome-cd/gnome-cd.c 19 Jan 2006 23:52:18 -0000 1.104 @@ -977,22 +977,20 @@ int main (int argc, char *argv[]) { - static const GOptionEntry cd_goptions[] = { - { "device", '\0', 0, G_OPTION_ARG_FILENAME, &cd_option_device, + static struct poptOption cd_popt_options [] = { + { "device", '\0', POPT_ARG_STRING, &cd_option_device, 0, N_("CD device to use"), NULL }, - { "unique", '\0', 0, G_OPTION_ARG_NONE, &cd_option_unique, + { "unique", '\0', POPT_ARG_NONE, &cd_option_unique, 0, N_("Only start if there isn't already a CD player application running"), NULL }, - { "play", '\0', 0, G_OPTION_ARG_NONE, &cd_option_play, + { "play", '\0', POPT_ARG_NONE, &cd_option_play, 0, N_("Play the CD on startup"), NULL }, - { "tray", '\0', 0, G_OPTION_ARG_NONE, &cd_option_tray, + { "tray", '\0', POPT_ARG_NONE, &cd_option_tray, 0, N_("Start iconified to tray"), NULL}, - { NULL, '\0', 0, 0, NULL, NULL, NULL } + { NULL, '\0', 0, NULL, 0 }, }; GnomeCD *gcd; GnomeClient *client; - GOptionGroup *group; - GOptionContext *ctx; free (malloc (8)); /* -lefence */ @@ -1004,17 +1002,16 @@ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - ctx = g_option_context_new ("gnome-cd"); - #ifdef HAVE_GST - g_option_context_add_group (ctx, gst_init_get_option_group ()); -#endif + /* FIXME when transition to GOption is being made */ + /* g_option_context_add_group (context, gst_init_get_goption_group()); */ - g_option_context_add_main_entries (ctx, cd_goptions, GETTEXT_PACKAGE); + gst_init (&argc, &argv); /* gst will remove its own options */ +#endif gnome_program_init ("gnome-cd", VERSION, LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, ctx, + GNOME_PARAM_POPT_TABLE, cd_popt_options, GNOME_PARAM_APP_DATADIR, DATADIR, NULL); register_stock_icons (); ++++++ gnome-media-2.12.0.tar.bz2 -> gnome-media-2.14.0.tar.bz2 ++++++ ++++ 186013 lines of diff (skipped) ++++++ gnome-media-configure-args.patch ++++++ Index: configure.in =================================================================== RCS file: /cvs/gnome/gnome-media/configure.in,v retrieving revision 1.304 retrieving revision 1.303 diff -u -r1.304 -r1.303 --- configure.in 10 Feb 2006 12:44:59 -0000 1.304 +++ configure.in 10 Feb 2006 12:14:13 -0000 1.303 @@ -54,8 +54,7 @@ PKG_CHECK_MODULES(MEDIA, \ glib-2.0 >= 1.3.7 \ gmodule-2.0 >= 1.3.7 \ - libgnome-2.0 >= 2.13.7 \ - libgnomeui-2.0 >= 2.13.2 \ + libgnomeui-2.0 >= 1.102.0 \ esound >= 0.2.23) host=`uname -s` case "$host" in ++++++ grecord-args.patch ++++++ Index: grecord/src/gnome-recorder.c =================================================================== RCS file: /cvs/gnome/gnome-media/grecord/src/gnome-recorder.c,v retrieving revision 1.22 retrieving revision 1.21 diff -u -r1.22 -r1.21 --- grecord/src/gnome-recorder.c 10 Feb 2006 12:45:00 -0000 1.22 +++ grecord/src/gnome-recorder.c 19 Jan 2006 23:52:20 -0000 1.21 @@ -167,34 +167,55 @@ main (int argc, char **argv) { - gchar **filenames = NULL; - /* this is necessary because someone apparently forgot to add a - * convenient way to get the remaining arguments to the GnomeProgram - * API when adding the GOption stuff to it ... */ - const GOptionEntry entries[] = { - { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, - "Special option that collects any remaining arguments for us" }, - { NULL, } - }; - - GOptionContext *ctx; GnomeProgram *program; + gchar **filenames = NULL; /* Init gettext */ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - ctx = g_option_context_new ("gnome-sound-recorder"); - g_option_context_add_group (ctx, gst_init_get_option_group ()); - g_option_context_add_main_entries (ctx, entries, GETTEXT_PACKAGE); +/* FIXME: remove ifdef here and else branch when bumping requirements to 2.14 */ +#ifdef GNOME_PARAM_GOPTION_CONTEXT + if (1) { + GOptionContext *ctx; + /* this is necessary because someone apparently forgot to add a + * convenient way to get the remaining arguments to the GnomeProgram + * API when adding the GOption stuff to it ... */ + GOptionEntry entries[] = { + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, + "Special option that collects any remaining arguments for us" }, + { NULL } + }; + + ctx = g_option_context_new ("gnome-sound-recorder"); + g_option_context_add_group (ctx, gst_init_get_option_group ()); + g_option_context_add_main_entries (ctx, entries, GETTEXT_PACKAGE); + program = gnome_program_init ("gnome-sound-recorder", VERSION, + LIBGNOMEUI_MODULE, argc, argv, + GNOME_PARAM_GOPTION_CONTEXT, ctx, + GNOME_PARAM_HUMAN_READABLE_NAME, + "GNOME Sound Recorder", + GNOME_PARAM_APP_DATADIR, DATADIR, + NULL); + } +#else /* GNOME_PARAM_GOPTION_CONTEXT */ + gst_init (&argc, &argv); + program = gnome_program_init ("gnome-sound-recorder", VERSION, - LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, ctx, - GNOME_PARAM_HUMAN_READABLE_NAME, - "GNOME Sound Recorder", - GNOME_PARAM_APP_DATADIR, DATADIR, - NULL); + LIBGNOMEUI_MODULE, + argc, argv, + GNOME_PARAM_HUMAN_READABLE_NAME, + "GNOME Sound Recorder", + GNOME_PARAM_APP_DATADIR, DATADIR, + NULL); + + if (argc > 1) { + filenames = g_strdupv (&argv[1]); + } else { + filenames = NULL; + } +#endif /* GNOME_PARAM_GOPTION_CONTEXT */ init_recent (); ++++++ gst-mixer-args.patch ++++++ Index: gst-mixer/src/main.c =================================================================== RCS file: /cvs/gnome/gnome-media/gst-mixer/src/main.c,v retrieving revision 1.12 retrieving revision 1.11 diff -u -r1.12 -r1.11 --- gst-mixer/src/main.c 10 Feb 2006 12:45:01 -0000 1.12 +++ gst-mixer/src/main.c 19 Jan 2006 23:52:21 -0000 1.11 @@ -166,8 +166,6 @@ main (gint argc, gchar *argv[]) { - GOptionContext *ctx; - GOptionGroup *group; gchar *appfile; GtkWidget *win; GList *elements; @@ -177,14 +175,29 @@ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - ctx = g_option_context_new ("gnome-volume-control"); - g_option_context_add_group (ctx, gst_init_get_option_group ()); +/* FIXME: remove when bumping requirements to 2.14 */ +#ifdef GNOME_PARAM_GOPTION_CONTEXT + if (1) { + GOptionContext *ctx; + GOptionGroup *group; + ctx = g_option_context_new ("gnome-volume-control"); + g_option_context_add_group (ctx, gst_init_get_option_group ()); + + gnome_program_init ("gnome-volume-control", VERSION, + LIBGNOMEUI_MODULE, argc, argv, + GNOME_PARAM_GOPTION_CONTEXT, ctx, + GNOME_PARAM_APP_DATADIR, DATA_DIR, + NULL); + } +#else /* GNOME_PARAM_GOPTION_CONTEXT */ + gst_init (&argc, &argv); gnome_program_init ("gnome-volume-control", VERSION, - LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, ctx, - GNOME_PARAM_APP_DATADIR, DATA_DIR, - NULL); + LIBGNOMEUI_MODULE, argc, argv, + GNOME_PARAM_APP_DATADIR, DATA_DIR, NULL); + +#endif /* GNOME_PARAM_GOPTION_CONTEXT */ + /* init ourselves */ register_stock_icons (); ++++++ gstreamer-properties-args.patch ++++++ Index: gstreamer-properties/gstreamer-properties.c =================================================================== RCS file: /cvs/gnome/gnome-media/gstreamer-properties/gstreamer-properties.c,v retrieving revision 1.17 retrieving revision 1.16 diff -u -r1.17 -r1.16 --- gstreamer-properties/gstreamer-properties.c 10 Feb 2006 12:45:01 -0000 1.17 +++ gstreamer-properties/gstreamer-properties.c 29 Jan 2006 23:24:00 -0000 1.16 @@ -395,20 +395,30 @@ int main (int argc, char **argv) { - GOptionContext *ctx; - GOptionGroup *group; - /* bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); */ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - ctx = g_option_context_new ("gstreamer-properties"); - g_option_context_add_group (ctx, gst_init_get_option_group ()); +/* FIXME: remove when bumping requirements to 2.14 */ +#ifdef GNOME_PARAM_GOPTION_CONTEXT + if (1) { + GOptionContext *ctx; + GOptionGroup *group; + + ctx = g_option_context_new ("gstreamer-properties"); + g_option_context_add_group (ctx, gst_init_get_option_group ()); + + gnome_program_init ("gstreamer-properties", VERSION, + LIBGNOMEUI_MODULE, argc, argv, + GNOME_PARAM_GOPTION_CONTEXT, ctx, + GNOME_PARAM_APP_DATADIR, DATADIR, NULL); + } +#else /* GNOME_PARAM_GOPTION_CONTEXT */ + gst_init (&argc, &argv); gnome_program_init ("gstreamer-properties", VERSION, - LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_GOPTION_CONTEXT, ctx, - GNOME_PARAM_APP_DATADIR, DATADIR, NULL); + LIBGNOMEUI_MODULE, argc, argv, GNOME_PARAM_APP_DATADIR, DATADIR, NULL); +#endif /* GNOME_PARAM_GOPTION_CONTEXT */ /* FIXME: hardcode uninstalled path here */ if (g_file_test ("gstreamer-properties.glade", G_FILE_TEST_EXISTS) == TRUE) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...