SPECS: gnome-media.spec - merged from DEVEL

freetz freetz at pld-linux.org
Sun Apr 2 13:46:05 CEST 2006 

Author: freetz                       Date: Sun Apr  2 11:46:05 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-media.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: SPECS/gnome-media.spec
diff -u SPECS/gnome-media.spec:1.128 SPECS/gnome-media.spec:1.129
--- SPECS/gnome-media.spec:1.128	Sat Jan 21 01:01:16 2006
+++ SPECS/gnome-media.spec	Sun Apr  2 13:46:00 2006
@@ -3,12 +3,12 @@
 Summary(fr):	Programmes multimédia de GNOME
 Summary(pl):	Programy multimedialne dla GNOME
 Name:		gnome-media
-Version:	2.12.0
-Release:	3
+Version:	2.14.0
+Release:	1
 License:	GPL v2+/LGPL v2+
 Group:		X11/Applications/Multimedia
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-media/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	74d9a78f7269602e033ab1a4a144afdf
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-media/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	e1304b3fb5e069025bb2c1ea3f9f8b62
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-capplet.patch
 URL:		http://www.gnome.org/
@@ -24,25 +24,24 @@
 BuildRequires:	gail-devel >= 1.8.0
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
-BuildRequires:	gstreamer-GConf-devel >= 0.8.8
-BuildRequires:	gstreamer-devel >= 0.8.9
-BuildRequires:	gstreamer-plugins-devel >= 0.8.8
+BuildRequires:	gnome-vfs2-devel >= 2.10.0-2 
+BuildRequires:	gstreamer-audio-effects-base >= 0.10
+BuildRequires:	gstreamer-devel >= 0.10.3
+BuildRequires:	gstreamer-plugins-base-devel >= 0.10
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.11.2-2
+BuildRequires:	libgnomeui-devel >= 2.13.3
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	nautilus-cd-burner-devel >= 2.11.1
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.3.11
-BuildRequires:	xft-devel >= 2.1.2
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	gail >= 1.8.0
+Requires:	gstreamer-GConf
 Requires:	gstreamer-audiosink
-Requires:	gstreamer-plugins >= 0.8.8
-Requires:	libgnomeui >= 2.11.2-2
+Requires:	libgnomeui >= 2.13.3
 Requires:	nautilus-cd-burner-libs >= 2.11.1
 Obsoletes:	gnome
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,9 +71,9 @@
 Requires(post):	GConf2
 Requires(post):	scrollkeeper
 Requires:	%{name}-cddb = %{epoch}:%{version}-%{release}
-Requires:	gstreamer-audio-effects
+Requires:	gstreamer-audio-effects-base >= 0.10.3
 Requires:	gstreamer-audiosink
-Requires:	gstreamer-cdparanoia >= 0.8.8-2
+Requires:	gstreamer-cdparanoia >= 0.10
 Conflicts:	gnome-media <= 0:2.8.0-5
 
 %description cd
@@ -142,7 +141,7 @@
 Requires(post):	GConf2
 Requires(post):	scrollkeeper
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gstreamer-audio-effects
+Requires:	gstreamer-audio-effects-base >= 0.10.3
 Requires:	gstreamer-audiosink
 Obsoletes:	grecord
 Conflicts:	gnome-media <= 0:2.8.0-5
@@ -170,7 +169,7 @@
 Summary(pl):	Regulator głośności
 Group:		X11/Applications/Multimedia
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gstreamer-audio-effects
+Requires:	gstreamer-audio-effects-base >= 0.10.3
 Requires:	gstreamer-audiosink
 Conflicts:	gnome-media <= 0:2.8.0-5
 
@@ -200,6 +199,7 @@
 %patch1 -p1
 
 %build
+%{__gnome_doc_common}
 %{__intltoolize}
 %{__libtoolize}
 %{__glib_gettextize}
@@ -218,17 +218,15 @@
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.{la,a}
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %find_lang %{name}-2.0
-%find_lang gstreamer-properties --with-gnome
 %find_lang gnome-cd --with-gnome
 %find_lang gnome-sound-recorder --with-gnome
-%find_lang grecord --with-gnome
 %find_lang gnome-volume-control --with-gnome
-
+%find_lang grecord --with-gnome
+%find_lang gstreamer-properties --with-gnome
 cat gstreamer-properties.lang >> %{name}-2.0.lang
-cat gnome-sound-recorder.lang >> grecord.lang
+cat grecord.lang >> gnome-sound-recorder.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -301,6 +299,17 @@
 %{_pixmapsdir}/gstreamer-properties.png
 %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnome-media-profiles.so
+%{_libdir}/libgnome-media-profiles.la
+%{_includedir}/gnome-media
+%{_pkgconfigdir}/*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libgnome-media-profiles.a
+
 %files cd -f gnome-cd.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gnome-cd
@@ -345,18 +354,13 @@
 %defattr(644,root,root,755)
 %{_libdir}/libcddb-slave2.a
 
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgnome-media-profiles.so
-%{_libdir}/libgnome-media-profiles.la
-%{_includedir}/gnome-media
-%{_pkgconfigdir}/*
-
-%files sound-recorder -f grecord.lang
+%files sound-recorder -f gnome-sound-recorder.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gnome-sound-recorder
 %{_datadir}/gnome-sound-recorder
 %{_desktopdir}/gnome-sound-recorder.desktop
+%{_pixmapsdir}/gnome-grecord.png
+%{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas
 %{_omf_dest_dir}/%{name}/grecord-C.omf
 %lang(de) %{_omf_dest_dir}/%{name}/grecord-de.omf
 %lang(es) %{_omf_dest_dir}/%{name}/grecord-es.omf
@@ -368,12 +372,6 @@
 %lang(uk) %{_omf_dest_dir}/%{name}/grecord-uk.omf
 %lang(zh_CN) %{_omf_dest_dir}/%{name}/grecord-zh_CN.omf
 %lang(zh_TW) %{_omf_dest_dir}/%{name}/grecord-zh_TW.omf
-%{_pixmapsdir}/gnome-grecord.png
-%{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgnome-media-profiles.a
 
 %files volume-control -f gnome-volume-control.lang
 %defattr(644,root,root,755)
@@ -399,6 +397,27 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2006/04/02 11:46:00  freetz
+- merged from DEVEL
+
+Revision 1.128.2.6  2006/03/12 21:48:00  freetz
+- 2.14.0
+
+Revision 1.128.2.5  2006/02/27 22:20:16  freetz
+- 2.13.93, removed gstreamer-GConf BR
+
+Revision 1.128.2.4  2006/02/15 07:55:33  freetz
+- 2.13.92, updated deps
+
+Revision 1.128.2.3  2006/01/31 18:53:51  patrys
+- temporarily added BR: gstreamer-audio-effects-base (won't build without it)
+
+Revision 1.128.2.2  2006/01/31 16:56:27  freetz
+- fixed gstreamer deps
+
+Revision 1.128.2.1  2006/01/31 13:54:47  freetz
+- 2.13.91
+
 Revision 1.128  2006/01/21 00:01:16  arekm
 - kill Icon: field (support for these is obsolete says jbj)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-media.spec?r1=1.128&r2=1.129&f=u

More information about the pld-cvs-commit mailing list