--- a/ChangeLog Wed Feb 11 14:33:14 2004 +0000
+++ b/ChangeLog Wed Feb 11 16:49:58 2004 +0000
@@ -1,3 +1,15 @@
+2004-02-11 Matt Keenan <[email protected]>
+
+ * gnome-media.spec : Bump 2.5.2, l10n docs stuff
+ * patches/gnome-media-01-potfiles.diff : reapplied
+ * patches/gnome-media-02-window-title.diff : reapplied
+ * patches/gnome-media-03-menu-entry.diff : reapplied
+ * patches/gnome-media-04-prompt-overwrite.diff : reapplied
+ * patches/gnome-media-05-record-scheduler.diff : reapplied
+ * patches/gnome-media-06-grecord-configure.diff : New patch
+ * patches/gnome-media-06-saving-zero-bytes-data.diff: Remove patch
+ * patches/gnome-media-07-gnome-audio-schema.diff: New patch
+
2004-02-11 Matt Keenan <[email protected]>
* libgtop.spec : Bump l10n to 0.7
--- a/gnome-media.spec Wed Feb 11 14:33:14 2004 +0000
+++ b/gnome-media.spec Wed Feb 11 16:49:58 2004 +0000
@@ -1,24 +1,27 @@
Name: gnome-media
Summary: GNOME Multimedia
Group: System/GUI/GNOME
-Version: 2.5.1
-Release: 3
-Distribution: Quicksilver
+Version: 2.5.2
+Release: 4
+Distribution: Cinnabar
Vendor: Sun Microsystems, Inc.
License: GPL
Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.5/gnome-media-%{version}.tar.bz2
-Source1: gnome-media-l10n-po-0.6.tar.bz2
+Source1: gnome-media-l10n-po-0.7.tar.bz2
Source2: gnome-mixer.png
-Source3: gnome-media_docs-0.1.tar.bz2
+Source3: gnome-media_docs-0.2.tar.bz2
Source4: cddb-slave2-properties.1.gz
Source5: gnome-cd.1.gz
Source6: gnome-sound-recorder.1.gz
+Source7: gnome-media-l10n-online-help-qs.tar.bz2
+Source8: OrigTree.pm
Patch1: gnome-media-01-potfiles.diff
Patch2: gnome-media-02-window-title.diff
Patch3: gnome-media-03-menu-entry.diff
Patch4: gnome-media-04-prompt-overwrite.diff
Patch5: gnome-media-05-record-scheduler.diff
-Patch6: gnome-media-06-saving-zero-bytes-data.diff
+Patch6: gnome-media-06-grecord-configure.diff
+Patch7: gnome-media-07-gnome-audio-schema.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_docdir}
@@ -50,10 +53,16 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
cp %SOURCE2 gmix
bzcat %SOURCE1 | tar xvf -
bzcat %SOURCE3 | tar xvf -
+bzcat %SOURCE7 | tar xvf -
+
+# OrigTree.pm missing from dist tarball. add it
+mkdir -p modules/XML/Parser/Style
+cp %SOURCE8 modules/XML/Parser/Style
%build
libtoolize --force
@@ -101,7 +110,7 @@
%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="gnome-volume-control.schemas CDDB-Slave2.schemas gnome-cd.schemas gnome-sound-recorder.schemas"
+SCHEMAS="CDDB-Slave2.schemas gnome-cd.schemas gnome-audio-profiles.schemas gnome-sound-recorder.schemas"
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
done
@@ -133,6 +142,8 @@
%{_libexecdir}/*
%{_libdir}/*.so.*
%{_libdir}/bonobo/servers/*
+%{_libdir}/pkgconfig/*
+%{_libdir}/libglade/*
%{_includedir}/*
%{_datadir}/locale/*/LC_MESSAGES/*.mo
%{_datadir}/control-center-2.0/capplets/*
@@ -142,11 +153,18 @@
%{_datadir}/pixmaps/*
%{_sysconfdir}/gconf/schemas/*.schemas
%{_datadir}/applications/*
-%{_datadir}/gnome-sound-recorder
-%{_datadir}/gstreamer-properties
+%{_datadir}/gnome-media/*
+%{_datadir}/gnome-sound-recorder/*
+%{_datadir}/gstreamer-properties/*
%{_mandir}/man1/*
%changelog
+* Wed Feb 11 2004 - <[email protected]>
+- Bump to 2.5.2, l10n to 0.7, docs 0.2
+ Re-apply patchs 01->05
+ Remove original patch 06
+ Add new patch 06 to build gnome-sound-recorder
+
* Wed Dec 17 2003 - <[email protected]>
- Bump to 2.5.1
--- a/patches/gnome-media-01-potfiles.diff Wed Feb 11 14:33:14 2004 +0000
+++ b/patches/gnome-media-01-potfiles.diff Wed Feb 11 16:49:58 2004 +0000
@@ -1,5 +1,5 @@
---- gnome-media-2.5.1/po/POTFILES.in 2003-10-25 22:44:40.000000000 +1300
-+++ gnome-media-2.5.1-hacked/po/POTFILES.in 2003-12-18 00:02:28.000000000 +1300
+--- ../gnome-media-2.5.2.old/po/POTFILES.in 2004-02-11 14:37:46.000000000 +0000
++++ ./po/POTFILES.in 2004-02-11 14:39:27.000000000 +0000
@@ -1,6 +1,5 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
@@ -7,26 +7,11 @@
cddb-slave2/GNOME_Media_CDDBSlave2.server.in.in
cddb-slave2/cddb-disclosure.c
cddb-slave2/cddb-slave-capplet.c
-@@ -17,21 +16,15 @@
- gnome-cd/gnome-cd.desktop.in
+@@ -16,6 +15,7 @@
gnome-cd/gnome-cd.schemas.in.in
gnome-cd/preferences.c
--gnome-volume-control/gnome-volume-control.desktop.in
grecord/gnome-sound-recorder.desktop.in
+grecord/gnome-sound-recorder.schemas.in
grecord/gnome-sound-recorder.schemas.in.in
grecord/gsr.xml
--grecord/src/grec.c
grecord/src/gsr-window.c
--grecord/src/gui.c
--grecord/src/main.c
--grecord/src/preferences.c
--grecord/src/sound.c
- gstreamer-properties/gstreamer-properties.c
- gstreamer-properties/gstreamer-properties.desktop.in
- gstreamer-properties/gstreamer-properties.glade
- gstreamer-properties/pipeline-constants.c
--gstreamer-properties/pipeline-test-old.c
- gstreamer-properties/pipeline-tests.c
- vu-meter/main.c
- vu-meter/reclevel.desktop.in
--- a/patches/gnome-media-02-window-title.diff Wed Feb 11 14:33:14 2004 +0000
+++ b/patches/gnome-media-02-window-title.diff Wed Feb 11 16:49:58 2004 +0000
@@ -1,11 +1,11 @@
---- gnome-media-2.2.1.1/cddb-slave2/cddb-slave-capplet.c 2003-01-08 09:36:18.000000000 -0800
-+++ gnome-media-2.2.1.1-hacked/cddb-slave2/cddb-slave-capplet.c 2003-07-22 09:04:42.000000000 -0700
-@@ -863,7 +863,7 @@
-
- changeset = gconf_change_set_new ();
+--- ../gnome-media-2.5.2.old/cddb-slave2/cddb-slave-capplet.c 2004-02-11 14:37:46.000000000 +0000
++++ ./cddb-slave2/cddb-slave-capplet.c 2004-02-11 14:40:41.000000000 +0000
+@@ -969,7 +969,7 @@
+ gconf_client_add_dir (client, "/apps/CDDB-Slave2",
+ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- dialog_win = gtk_dialog_new_with_buttons (_("CD Database Preferences"),
+ dialog_win = gtk_dialog_new_with_buttons (_("CD Database"),
NULL, -1,
- GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+ GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
--- a/patches/gnome-media-03-menu-entry.diff Wed Feb 11 14:33:14 2004 +0000
+++ b/patches/gnome-media-03-menu-entry.diff Wed Feb 11 16:49:58 2004 +0000
@@ -1,6 +1,5 @@
-diff -urN gnome-media-2.4.0/cddb-slave2/cddb-slave.desktop.in gnome-media-2.4.0-hacked/cddb-slave2/cddb-slave.desktop.in
---- gnome-media-2.4.0/cddb-slave2/cddb-slave.desktop.in 2003-07-03 18:15:47.000000000 +1200
-+++ gnome-media-2.4.0-hacked/cddb-slave2/cddb-slave.desktop.in 2003-10-31 14:01:47.000000000 +1300
+--- ../gnome-media-2.5.2.old/cddb-slave2/cddb-slave.desktop.in 2004-02-11 14:37:46.000000000 +0000
++++ ./cddb-slave2/cddb-slave.desktop.in 2004-02-11 14:42:26.000000000 +0000
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
@@ -11,15 +10,14 @@
Exec=cddb-slave2-properties
Icon=gnome-cd.png
StartupNotify=true
-diff -urN gnome-media-2.4.0/vu-meter/Makefile.am gnome-media-2.4.0-hacked/vu-meter/Makefile.am
---- gnome-media-2.4.0/vu-meter/Makefile.am 2002-06-23 01:21:50.000000000 +1200
-+++ gnome-media-2.4.0-hacked/vu-meter/Makefile.am 2003-10-31 14:00:59.000000000 +1300
+--- ../gnome-media-2.5.2.old/vu-meter/Makefile.am 2004-02-11 14:37:46.000000000 +0000
++++ ./vu-meter/Makefile.am 2004-02-11 14:42:45.000000000 +0000
@@ -23,7 +23,7 @@
pixmap_DATA = $(BITMAPS)
-EXTRA_DIST = $(BITMAPS) vumeter.desktop.in reclevel.desktop.in README TODO
-+EXTRA_DIST = $(BITMAPS) $(Audio_in_files) README TODO
++EXTRA_DIST = $(BITMAPS) README TODO
@INTLTOOL_DESKTOP_RULE@
Audio_in_files = vumeter.desktop.in reclevel.desktop.in
--- a/patches/gnome-media-04-prompt-overwrite.diff Wed Feb 11 14:33:14 2004 +0000
+++ b/patches/gnome-media-04-prompt-overwrite.diff Wed Feb 11 16:49:58 2004 +0000
@@ -1,6 +1,6 @@
---- gnome-media-2.2.2/grecord/src/gsr-window.c 2003-06-09 02:50:10.000000000 -0700
-+++ gnome-media-2.2.2-hacked/grecord/src/gsr-window.c 2003-08-06 08:34:09.000000000 -0700
-@@ -468,6 +468,118 @@
+--- ../gnome-media-2.5.2.old/grecord/src/gsr-window.c 2004-02-11 14:37:46.000000000 +0000
++++ ./grecord/src/gsr-window.c 2004-02-11 15:21:32.000000000 +0000
+@@ -494,6 +494,119 @@
GST_STATE_NULL);
}
@@ -13,41 +13,41 @@
+ GtkWidget *image;
+ GtkWidget *hbox;
+ GtkWidget *align;
-+
++
+ button = gtk_button_new ();
-+
++
+ if (GTK_BIN (button)->child)
+ gtk_container_remove (GTK_CONTAINER (button),
+ GTK_BIN (button)->child);
-+
++
+ if (gtk_stock_lookup (stock_id, &item))
+ {
+ label = gtk_label_new_with_mnemonic (text);
-+
++
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-+
++
+ image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
+ hbox = gtk_hbox_new (FALSE, 2);
-+
++
+ align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-+
++
+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-+
++
+ gtk_container_add (GTK_CONTAINER (button), align);
+ gtk_container_add (GTK_CONTAINER (align), hbox);
+ gtk_widget_show_all (align);
-+
++
+ return button;
+ }
+ label = gtk_label_new_with_mnemonic (text);
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-+
++
+ gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
-+
++
+ gtk_widget_show (label);
+ gtk_container_add (GTK_CONTAINER (button), label);
-+
++
+ return button;
+}
+
@@ -56,20 +56,20 @@
+ gint response_id)
+{
+ GtkWidget *button;
-+
++
+ g_return_val_if_fail (GTK_IS_DIALOG (dialog), NULL);
+ g_return_val_if_fail (text != NULL, NULL);
+ g_return_val_if_fail (stock_id != NULL, NULL);
+
+ button = gsr_button_new_with_stock_image (text, stock_id);
+ g_return_val_if_fail (button != NULL, NULL);
-+
++
+ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-+
++
+ gtk_widget_show (button);
-+
++
+ gtk_dialog_add_action_widget (dialog, button, response_id);
-+
++
+ return button;
+}
+
@@ -86,23 +86,23 @@
+ GTK_BUTTONS_NONE,
+ message,
+ file_name);
-+
++
+ /* Add Cancel button */
+ gtk_dialog_add_button (GTK_DIALOG (msgbox),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-+
++
+ /* Add Replace button */
+ gsr_dialog_add_button (GTK_DIALOG (msgbox),
+ _("_Replace"), GTK_STOCK_REFRESH, GTK_RESPONSE_YES);
-+
++
+ gtk_dialog_set_default_response (GTK_DIALOG (msgbox), GTK_RESPONSE_CANCEL);
-+
++
+ gtk_window_set_resizable (GTK_WINDOW (msgbox), FALSE);
-+
++
+ ret = gtk_dialog_run (GTK_DIALOG (msgbox));
-+
++
+ gtk_widget_destroy (msgbox);
-+
++
+ return (ret == GTK_RESPONSE_YES);
+}
+
@@ -116,10 +116,11 @@
+ file_name);
+}
+
++
static void
do_save_file (GSRWindow *window,
const char *name)
-@@ -478,6 +590,11 @@
+@@ -504,6 +617,11 @@
GstElement *pipeline, *src, *encoder, *spider, *sink;
GdkCursor *cursor;
--- a/patches/gnome-media-05-record-scheduler.diff Wed Feb 11 14:33:14 2004 +0000
+++ b/patches/gnome-media-05-record-scheduler.diff Wed Feb 11 16:49:58 2004 +0000
@@ -1,10 +1,11 @@
---- gnome-media-2.2.2/grecord/src/gnome-recorder.c 2003-09-19 20:00:56.000000000 -0700
-+++ gnome-media-2.2.2-new/grecord/src/gnome-recorder.c 2003-09-19 20:01:06.000000000 -0700
-@@ -170,7 +170,6 @@ main (int argc,
- gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-audio2.png");
- /* Init GStreamer */
- gst_init (&argc, &argv);
+--- ../gnome-media-2.5.2.old/grecord/src/gnome-recorder.c 2004-02-11 15:27:09.000000000 +0000
++++ ./grecord/src/gnome-recorder.c 2004-02-11 15:27:48.000000000 +0000
+@@ -160,7 +160,7 @@
+
+ /* init gstreamer */
+ gsr_options[0].arg = (void *) gst_init_get_popt_table ();
- gst_scheduler_factory_set_default_name ("basicomega");
++ gst_scheduler_factory_set_default_name ("basicgthread");
- /* Init the icons */
- init_stock_icons ();
+ /* Init GNOME */
+ program = gnome_program_init ("gnome-sound-recorder", VERSION,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-media-06-grecord-configure.diff Wed Feb 11 16:49:58 2004 +0000
@@ -0,0 +1,22 @@
+--- ../gnome-media-2.5.2.old/configure.in 2004-02-11 16:08:32.000000000 +0000
++++ ./configure.in 2004-02-11 16:10:25.000000000 +0000
+@@ -88,7 +88,7 @@
+ if test "x$HAVE_GST" = "xno"; then
+ AC_MSG_WARN(you need GStreamer installed for the mixer and recorder to work)
+ else
+- PROGRAMS_GSTRECORD="grecord"
++ PROGRAMS_GRECORD="grecord"
+ fi
+ AC_SUBST(PROGRAMS_GRECORD)
+
+@@ -362,5 +362,10 @@
+ else
+ echo "GStreamer capplet: no"
+ fi
++if test x$PROGRAMS_GRECORD != x; then
++ echo "Sound Recorder: yes"
++else
++ echo "Sound Recorder: no"
++fi
+ echo "------------------------------------------- "
+
--- a/patches/gnome-media-06-saving-zero-bytes-data.diff Wed Feb 11 14:33:14 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -urN gnome-media-2.2.2.orig/grecord/src/gnome-recorder.c gnome-media-2.2.2/grecord/src/gnome-recorder.c
---- gnome-media-2.2.2.orig/grecord/src/gnome-recorder.c 2003-10-17 11:20:51.000000000 +0200
-+++ gnome-media-2.2.2/grecord/src/gnome-recorder.c 2003-10-17 11:23:04.000000000 +0200
-@@ -170,6 +170,7 @@
- gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-audio2.png");
- /* Init GStreamer */
- gst_init (&argc, &argv);
-+ gst_scheduler_factory_set_default_name ("basicgthread");
-
- /* Init the icons */
- init_stock_icons ();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-media-07-gnome-audio-schema.diff Wed Feb 11 16:49:58 2004 +0000
@@ -0,0 +1,11 @@
+--- ../gnome-media-2.5.2.old/profiles/gnome-audio-profiles.schemas.in.in 2004-02-11 16:08:32.000000000 +0000
++++ ./profiles/gnome-audio-profiles.schemas.in.in 2004-02-11 16:37:20.000000000 +0000
+@@ -79,7 +79,7 @@
+ <key>/schemas/system/gstreamer/audio/profiles/active</key>
+ <owner>gnome-media</owner>
+ <type>bool</type>
+- <default></default>
++ <default>true</default>
+ <locale name="C">
+ <short>Whether or not this profile is to be used</short>
+ <long>