--- a/gnome-media.spec	Wed Mar 24 00:56:27 2004 +0000
+++ b/gnome-media.spec	Wed Mar 24 01:57:02 2004 +0000
@@ -1,29 +1,21 @@
 Name:         gnome-media
 Summary:      GNOME Multimedia
 Group:        System/GUI/GNOME
-Version:      2.5.2
-Release:      10
+Version:      2.6.0
+Release:      1
 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
+Source:       http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.6/gnome-media-%{version}.tar.bz2
 Source1:      gnome-media-l10n-po-0.7.tar.bz2
-Source2:      gnome-mixer.png
-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
+Source2:      gnome-media_docs-0.2.tar.bz2
+Source3:      cddb-slave2-properties.1.gz
+Source4:      gnome-cd.1.gz
+Source5:      gnome-sound-recorder.1.gz
+Source6:      gnome-media-l10n-online-help-qs.tar.bz2
+Patch1:       gnome-media-01-g11n-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-grecord-configure.diff
-Patch7:       gnome-media-07-gnome-audio-schema.diff
-Patch8:       gnome-media-08-gnome-volume-desktop.diff
-Patch9:       gnome-media-09-gst-mixer-array.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_docdir}
@@ -55,21 +47,10 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -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
+bzcat %SOURCE2 | tar xvf -
+bzcat %SOURCE6 | tar xvf -
 
 %build
 libtoolize --force
@@ -102,9 +83,9 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
 install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE6 $RPM_BUILD_ROOT%{_mandir}/man1 
+install --mode=0644 %SOURCE5 $RPM_BUILD_ROOT%{_mandir}/man1 
 
 #Copy zh_HK from zh_TW
 #Fixes bug 4930405
@@ -159,13 +140,21 @@
 %{_datadir}/idl/*
 %{_datadir}/pixmaps/*
 %{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/applications/*
+%{_datadir}/applications/gnome-cd.desktop
+%{_datadir}/applications/gnome-sound-recorder.desktop
+%{_datadir}/applications/gnome-volume-control.desktop
 %{_datadir}/gnome-media/*
 %{_datadir}/gnome-sound-recorder/*
 %{_datadir}/gstreamer-properties/*
 %{_mandir}/man1/*
 
 %changelog
+* Wed Mar 24 2004 - <[email protected]>
+- Bump to 2.6.0, and remove record scheduler, 
+  grecord configure, audio schemas, gnome volume 
+  desktop, gst mixer array and grecord prompt
+  overwrite [needs to be rewritten] patches.
+
 * Fri Mar 05 2004 - <[email protected]>
 - pass in ACLOCAL_FLAGS to aclocal