SPECS: gnome-media.spec - updated to 2.24.0; merged changes from DEVEL - re...

megabajt megabajt at pld-linux.org
Mon Sep 29 20:31:00 CEST 2008


Author: megabajt                     Date: Mon Sep 29 18:31:00 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.24.0; merged changes from DEVEL
- removed obsolete -desktop.patch, -configure.patch and glsink.patch

---- Files affected:
SPECS:
   gnome-media.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: SPECS/gnome-media.spec
diff -u SPECS/gnome-media.spec:1.151 SPECS/gnome-media.spec:1.152
--- SPECS/gnome-media.spec:1.151	Wed Mar 12 01:23:27 2008
+++ SPECS/gnome-media.spec	Mon Sep 29 20:30:55 2008
@@ -3,56 +3,49 @@
 Summary(fr.UTF-8):	Programmes multimédia de GNOME
 Summary(pl.UTF-8):	Programy multimedialne dla GNOME
 Name:		gnome-media
-Version:	2.22.0
+Version:	2.24.0.1
 Release:	1
 License:	GPL v2+/LGPL v2+
 Group:		X11/Applications/Multimedia
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5:	e3fabb87abd2731d7f345d724b40333a
-Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-configure.patch
-Patch2:		%{name}-glsink.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5:	d0a9b0784872cecd09038aceea22e16f
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	ORBit2-devel >= 1:2.14.9
-%ifnarch sparc sparc64
-BuildRequires:	alsa-lib-devel
-%endif
-BuildRequires:	autoconf >= 2.53
+BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
-BuildRequires:	gnome-control-center-devel >= 1:2.22.0
 BuildRequires:	esound-devel >= 1:0.2.37
-BuildRequires:	gail-devel >= 1.20.0
 BuildRequires:	gettext-devel
-BuildRequires:	gnome-common >= 2.20.0
-BuildRequires:	gnome-vfs2-devel >= 2.22.0
+BuildRequires:	gnome-common >= 2.24.0
+BuildRequires:	gnome-doc-utils
 BuildRequires:	gstreamer-devel >= 0.10.11
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.11
-BuildRequires:	gtk+2-devel >= 2:2.12.0
-BuildRequires:	intltool >= 0.36.2
-BuildRequires:	libbonobo-devel >= 2.22.0
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+BuildRequires:	intltool >= 0.40.0
+BuildRequires:	libbonobo-devel >= 2.24.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.19.1
+BuildRequires:	libgnomeui-devel >= 2.24.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.30
-BuildRequires:	nautilus-cd-burner-devel >= 2.22.0
+BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.3.11
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	gail >= 1.20.0
 Requires:	gstreamer-GConf
 Requires:	gstreamer-audiosink
-Requires:	libgnomeui >= 2.19.1
-Requires:	nautilus-cd-burner-libs >= 2.22.0
+Requires:	libgnomeui >= 2.24.0
 Obsoletes:	gnome
+Obsoletes:	gnome-media-cd
+Obsoletes:	gnome-media-cddb
+Obsoletes:	gnome-media-cddb-devel
+Obsoletes:	gnome-media-cddb-static
+Obsoletes:	gnome-media-vumeter
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_gnomehelpdir	%{_datadir}/gnome/help
-
 %description
 GNOME media programs. GNOME is the GNU Network Object Model
 Environment. That's a fancy name but really GNOME is a nice GUI
@@ -73,7 +66,6 @@
 Summary:	gnome-media library
 Summary(pl.UTF-8):	Biblioteka gnome-media
 Group:		Development/Libraries
-Requires:	libgnomeui >= 2.19.1
 
 %description libs
 This package contains gnome-media library.
@@ -81,64 +73,6 @@
 %description libs -l pl.UTF-8
 Pakiet ten zawiera bibliotekę gnome-media.
 
-%package cd
-Summary:	CD player
-Summary(pl.UTF-8):	Odtwarzacz CD
-Group:		X11/Applications/Multimedia
-Requires(post):	GConf2
-Requires(post):	scrollkeeper
-Requires:	%{name}-cddb = %{epoch}:%{version}-%{release}
-Requires:	gstreamer-audio-effects-base >= 0.10.11
-Requires:	gstreamer-audiosink
-Requires:	gstreamer-cdparanoia >= 0.10.11
-Conflicts:	gnome-media <= 0:2.8.0-5
-
-%description cd
-CD player.
-
-%description cd -l pl.UTF-8
-Odtwarzacz CD.
-
-%package cddb
-Summary:	CD database server
-Summary(pl.UTF-8):	Serwer bazy danych płyt CD
-Group:		X11/Applications/Multimedia
-Requires(post):	GConf2
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-media <= 0:2.8.0-5
-
-%description cddb
-CD database server.
-
-%description cddb -l pl.UTF-8
-Serwer bazy danych płyt CD.
-
-%package cddb-devel
-Summary:	gnome-media-cddb devel file
-Summary(pl.UTF-8):	Pliki nagłówkowe gnome-media-cddb
-Group:		X11/Development/Libraries
-Requires:	%{name}-cddb = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-media-devel <= 0:2.8.0-5
-
-%description cddb-devel
-gnome-media-cddb devel files.
-
-%description cddb-devel -l pl.UTF-8
-Pliki nagłówkowe gnome-media-cddb.
-
-%package cddb-static
-Summary:	gnome-media-cddb static libraries
-Summary(pl.UTF-8):	Biblioteki statyczne gnome-media-cddb
-Group:		X11/Development/Libraries
-Requires:	%{name}-cddb-devel = %{epoch}:%{version}-%{release}
-Conflicts:	gnome-media-static <= 0:2.8.0-5
-
-%description cddb-static
-gnome-media-cddb static libraries.
-
-%description cddb-static -l pl.UTF-8
-Biblioteki statyczne gnome-media-cddb.
-
 %package devel
 Summary:	gnome-media devel files
 Summary(pl.UTF-8):	Pliki nagłówkowe gnome-media
@@ -160,9 +94,9 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	gstreamer-audio-effects-base >= 0.10.11
 Requires:	gstreamer-audiosink
+Suggests:	gnome-media-volume-control
 Obsoletes:	grecord
 Conflicts:	gnome-media <= 0:2.8.0-5
-Suggests:	gnome-media-volume-control
 
 %description sound-recorder
 Sound recorder.
@@ -197,35 +131,18 @@
 %description volume-control -l pl.UTF-8
 Regulator głośności.
 
-%package vumeter
-Summary:	Volume monitor
-Summary(pl.UTF-8):	Monitor głośności
-Group:		X11/Applications/Multimedia
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	gstreamer-audiosink
-Conflicts:	gnome-media <= 0:2.8.0-5
-
-%description vumeter
-Volume monitor.
-
-%description vumeter -l pl.UTF-8
-Monitor głośności.
-
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__gnome_doc_common}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure 
+%configure
 %{__make}
 
 %install
@@ -237,13 +154,10 @@
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.{la,a}
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name}-2.0
-%find_lang gnome-cd --with-gnome
-%find_lang gnome-sound-recorder --with-gnome
-%find_lang gnome-volume-control --with-gnome
-%find_lang gstreamer-properties --with-gnome
+%find_lang gnome-sound-recorder --with-gnome --with-omf
+%find_lang gnome-volume-control --with-gnome --with-omf
+%find_lang gstreamer-properties --with-gnome --with-omf
 cat gstreamer-properties.lang >> %{name}-2.0.lang
 
 %clean
@@ -264,28 +178,6 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post cd
-%scrollkeeper_update_post
-%gconf_schema_install gnome-cd.schemas
-
-%preun cd
-%gconf_schema_uninstall gnome-cd.schemas
-
-%postun cd
-%scrollkeeper_update_postun
-
-%post cddb
-/sbin/ldconfig
-%update_icon_cache hicolor
-%gconf_schema_install CDDB-Slave2.schemas
-
-%preun cddb
-%gconf_schema_uninstall CDDB-Slave2.schemas
-
-%postun cddb
-/sbin/ldconfig
-%update_icon_cache hicolor
-
 %post sound-recorder
 %update_icon_cache hicolor
 %scrollkeeper_update_post
@@ -323,6 +215,7 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnome-media-profiles.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnome-media-profiles.so.0
 
 %files devel
 %defattr(644,root,root,755)
@@ -335,42 +228,12 @@
 %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
-%{_desktopdir}/gnome-cd.desktop
-%{_pixmapsdir}/gnome-cd/*
-%{_sysconfdir}/gconf/schemas/gnome-cd.schemas
-
-%files cddb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/cddb-slave2-properties
-%attr(755,root,root) %{_libdir}/CDDBSlave2
-%attr(755,root,root) %{_libdir}/cddb-track-editor
-%attr(755,root,root) %{_libdir}/libcddb-slave2.so.*.*
-%{_datadir}/idl/GNOME_Media_CDDBSlave2.idl
-%{_desktopdir}/cddb-slave.desktop
-%{_libdir}/bonobo/servers/GNOME_Media_CDDBSlave2.server
-%dir %{_pixmapsdir}/gnome-cd
-%{_iconsdir}/hicolor/*/*/gnome-cd.*
-%{_sysconfdir}/gconf/schemas/CDDB-Slave2.schemas
-
-%files cddb-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcddb-slave2.so
-%{_libdir}/libcddb-slave2.la
-%{_includedir}/cddb-slave2
-
-%files cddb-static
-%defattr(644,root,root,755)
-%{_libdir}/libcddb-slave2.a
-
 %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
-%{_iconsdir}/hicolor/*/*/gnome-grecord.*
+%{_iconsdir}/hicolor/*/*/gnome-sound-recorder.*
 %{_sysconfdir}/gconf/schemas/gnome-sound-recorder.schemas
 
 %files volume-control -f gnome-volume-control.lang
@@ -378,23 +241,35 @@
 %attr(755,root,root) %{_bindir}/gnome-volume-control
 %{_datadir}/gnome-media/pixmaps/*
 %{_desktopdir}/gnome-volume-control.desktop
+%{_iconsdir}/hicolor/*/devices/gvc-*.png
+%{_iconsdir}/hicolor/*/status/audio-input-microphone-muted.png
 %{_sysconfdir}/gconf/schemas/gnome-volume-control.schemas
 
-%files vumeter
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/vumeter
-%{_desktopdir}/reclevel.desktop
-%{_desktopdir}/vumeter.desktop
-%{_iconsdir}/hicolor/*/*/gnome-reclevel.*
-%{_iconsdir}/hicolor/*/*/gnome-vumeter.*
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.151  2008/03/12 00:23:27  patrys
+Revision 1.152  2008/09/29 18:30:55  megabajt
+- updated to 2.24.0; merged changes from DEVEL
+- removed obsolete -desktop.patch, -configure.patch and glsink.patch
+
+Revision 1.151.2.4  2008/09/12 22:40:05  patrys
+- 2.23.92
+- dropped X-Capplet (fix applnk, not GNOME)
+
+Revision 1.151.2.3  2008/09/04 10:02:11  patrys
+- 2.23.91
+
+Revision 1.151.2.2  2008-06-03 20:48:33  patrys
+- 2.23.3
+
+Revision 1.151.2.1  2008-05-13 12:57:49  patrys
+- 2.23.1.1
+- gnome-cd and gnome-cddb are obsolete and deprecated
+
+Revision 1.151  2008-03-12 00:23:27  patrys
 - 2.22.0
 - waiting for gnome-control-center
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-media.spec?r1=1.151&r2=1.152&f=u



More information about the pld-cvs-commit mailing list