--- a/gnome-media.spec Thu Aug 11 18:30:17 2005 +0000
+++ b/gnome-media.spec Thu Aug 11 18:34:53 2005 +0000
@@ -1,52 +1,36 @@
+#
+# spec file for package gnome-media
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
Name: gnome-media
Summary: GNOME Multimedia
Group: System/GUI/GNOME
-Version: 2.6.1
-Release: 53
-Distribution: Java Desktop System, Release 3
+Version: 2.10.2
+Release: 2
+Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
License: GPL
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.6/gnome-media-%{version}.tar.bz2
-Source1: gnome-media-l10n-po-1.14.tar.bz2
-Source2: gnome-media_docs-0.6.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.10/%{name}-%{version}.tar.bz2
+Source1: gst-std-options.5.gz
+Source2: vumeter.1.gz
Source3: cddb-slave2-properties.1.gz
-Source4: gnome-cd.1.gz
-Source5: gnome-sound-recorder.1.gz
-Source6: gnome-media-l10n-online-help-ci-linux-1.1.tar.bz2
-Source7: gnome-audio-profiles-properties.1.gz
-Source8: gnome-volume-control.1.gz
-Source9: gstreamer-properties.1.gz
-Source10: vumeter.1.gz
-Source11: gst-std-options.5.gz
-Source12: l10n-configure.sh
+Source4: gnome-sound-recorder.1.gz
+Source5: gstreamer-properties.1.gz
+Source6: gnome-audio-profiles-properties.1.gz
+Source7: gnome-volume-control.1.gz
Patch1: gnome-media-01-window-title.diff
-Patch2: gnome-media-02-menu-entry.diff
-Patch3: gnome-media-03-cddb-help-filename-update.diff
-Patch4: gnome-media-04-solaris.diff
-Patch5: gnome-media-05-destroy-cache.diff
-Patch6: gnome-media-06-set-audio-port.diff
-Patch7: gnome-media-07-g11n-configure.diff
-Patch8: gnome-media-08-cdda.diff
-Patch9: gnome-media-09-l10n-online-help.diff
-Patch10: gnome-media-10-enable-lineout.diff
-Patch11: gnome-media-11-play-pipeline.diff
-Patch12: gnome-media-12-g11n-schemas.diff
-Patch13: gnome-media-13-remove-unusable-cache-entry.diff
-Patch14: gnome-media-14-save-record.diff
-Patch15: gnome-media-15-cddb-display.diff
-Patch16: gnome-media-16-prompt-on-overwrite.diff
-Patch17: gnome-media-17-stop-on-quit.diff
-Patch18: gnome-media-18-enable-pause.diff
-Patch19: gnome-media-19-gstreamer-prop-xml.diff
-Patch20: gnome-media-20-g11n-i18n-ui.diff
-Patch21: gnome-media-21-lossless-wav.diff
-Patch22: gnome-media-22-play-not-working.diff
+Patch2: gnome-media-02-cddb-display.diff
+Patch3: gnome-media-03-disable-gnome-cd.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_docdir}
Autoreqprov: on
Prereq: /sbin/ldconfig
+Prereq: GConf
%define gstreamer_version 0.8.1
%define gstreamer_devel_version 0.8.1
@@ -54,6 +38,7 @@
%define gstreamer_plugins_devel_version 0.8.1
%define scrollkeeper_version 0.3.14
%define libgnomeui_version 2.6.0
+%define nautilus_cd_burner_version 2.10.1
Requires: gstreamer >= %{gstreamer_version}
Requires: gstreamer-plugins >= %{gstreamer_plugins_version}
@@ -72,31 +57,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-
-bzcat %SOURCE1 | tar xf -
-bzcat %SOURCE2 | tar xf -
-bzcat %SOURCE6 | tar xf -
-
-bash -x %SOURCE12
%build
%ifos linux
@@ -114,7 +74,7 @@
glib-gettextize -f
%endif
libtoolize --force
-aclocal $ACLOCAL_FLAGS -I %{_datadir}/aclocal/gnome2-macros
+aclocal $ACLOCAL_FLAGS -I ./m4
automake -a -c -f
autoconf
@@ -123,19 +83,6 @@
--libexecdir=%{_libexecdir} \
--sysconfdir=%{_sysconfdir} \
--disable-esdtest
-# workaround gnome-cd/.deps/$(CDROM_HOST)-cdrom.Po
-case "`uname -s`" in
-*FreeBSD*)
- CDROM_HOST=freebsd
- ;;
-*Linux*)
- CDROM_HOST=linux
- ;;
-*SunOS*)
- CDROM_HOST=solaris
- ;;
-esac
-echo '# dummy' > ./gnome-cd/.deps/$CDROM_HOST-cdrom.Po
make -j $CPUS
@@ -145,26 +92,23 @@
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
install -d $RPM_BUILD_ROOT%{_mandir}/man1
install -d $RPM_BUILD_ROOT%{_mandir}/man5
-install --mode=0644 %SOURCE3 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE4 $RPM_BUILD_ROOT%{_mandir}/man1
+install --mode=0644 %SOURCE1 $RPM_BUILD_ROOT%{_mandir}/man5
+install --mode=0644 %SOURCE2 $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 %SOURCE7 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE8 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE9 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE10 $RPM_BUILD_ROOT%{_mandir}/man1
-install --mode=0644 %SOURCE11 $RPM_BUILD_ROOT%{_mandir}/man5
#Copy zh_HK from zh_TW
#Fixes bug 4930405
install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
-javahelp-convert-install $RPM_BUILD_ROOT gnome-cd gnome-cd.xml
javahelp-convert-install $RPM_BUILD_ROOT gnome-sound-recorder gnome-sound-recorder.xml
javahelp-convert-install $RPM_BUILD_ROOT gnome-volume-control gnome-volume-control.xml
javahelp-convert-install $RPM_BUILD_ROOT gstreamer-properties gstreamer-properties.xml
-chmod 644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/gnome-cd/*/*.xml
chmod 644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/gnome-sound-recorder/*/*.xml
#Clean up unpackaged files
@@ -180,7 +124,7 @@
%post
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="CDDB-Slave2.schemas gnome-cd.schemas gnome-audio-profiles.schemas gnome-sound-recorder.schemas"
+SCHEMAS="CDDB-Slave2.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
@@ -193,19 +137,19 @@
%{_bindir}/*
%{_libexecdir}/*
%{_libdir}/*.so.*
+%{_libdir}/libgnome-media-profiles.so
%{_libdir}/bonobo/servers/*
%{_libdir}/pkgconfig/*
%{_libdir}/libglade/*
%{_includedir}/*
%{_datadir}/locale/*/LC_MESSAGES/*.mo
-%{_datadir}/control-center-2.0/capplets/*
%{_datadir}/omf/gnome-media/*
%{_datadir}/gnome/help/*
%{_datadir}/gnome/javahelp/*
%{_datadir}/idl/*
%{_datadir}/pixmaps/*
%{_sysconfdir}/gconf/schemas/*.schemas
-%{_datadir}/applications/gnome-cd.desktop
+%{_datadir}/applications/cddb-slave.desktop
%{_datadir}/applications/gnome-sound-recorder.desktop
%{_datadir}/applications/gnome-volume-control.desktop
%{_datadir}/applications/gstreamer-properties.desktop
@@ -218,6 +162,21 @@
%{_mandir}/man5/*
%changelog
+* Tue Jul 12 2005 - [email protected]
+- Don't build gnome-cd
+
+* Tue Jun 21 2005 - [email protected]
+- Remove capplets from %files to build
+
+* Thu Jun 16 2005 - [email protected]
+- Bump l10n tarballs
+
+* Tue May 17 2005 - [email protected]
+- Bump to 2.10.2
+
+* Fri May 13 2005 - [email protected]
+- Bump to 2.10 and add -I ./m4 to aclocal flags since it is needed.
+
* Fri Apr 22 2005 - [email protected]
- Modified patch gnome-media-22-play-not-working.diff.
Fixes bug #6185195