rpms/gnome-media/devel gnome-media.spec,1.200,1.201

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-media/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21083

Modified Files:
	gnome-media.spec 
Log Message:
2.31.5



Index: gnome-media.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-media/devel/gnome-media.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- gnome-media.spec	13 Jul 2010 22:07:02 -0000	1.200
+++ gnome-media.spec	13 Jul 2010 23:59:18 -0000	1.201
@@ -40,9 +40,9 @@ BuildRequires:  intltool
 BuildRequires:  unique-devel
 BuildRequires:  scrollkeeper
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=519438
-Patch0: 0001-Add-speaker-testing-UI.patch
-BuildRequires: automake autoconf libtool gnome-common intltool
+## https://bugzilla.gnome.org/show_bug.cgi?id=519438
+#Patch0: 0001-Add-speaker-testing-UI.patch
+#BuildRequires: automake autoconf libtool gnome-common intltool
 
 %description
 This package contains a few media utilities for the GNOME desktop,
@@ -80,14 +80,17 @@ framework.
 
 %prep
 %setup -q
-%patch0 -p1 -b .speaker-test
-autoreconf -f
+#%patch0 -p1 -b .speaker-test
+#autoreconf -f
 
 # force regeneration
 rm profiles/gnome-audio-profiles.schemas
 
 %build
-%configure --disable-schemas-install --enable-gnomecd=no --enable-cddbslave=no
+%configure \
+        --disable-schemas-install \
+        --enable-gnomecd=no \
+        --enable-cddbslave=no
 make #%{?_smp_mflags}
 
 # strip unneeded translations from .mo files
@@ -103,8 +106,6 @@ for p in *.po; do
 done
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # show in all
@@ -120,8 +121,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applica
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/reclevel.desktop
 rm -f $RPM_BUILD_ROOT%{_bindir}/vumeter
 
-rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/lib*.*a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/glade3/modules/lib*.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 # save space by linking identical images in translated docs
@@ -149,9 +151,6 @@ cat gnome-audio-profiles.lang >> apps.la
 cat gnome-sound-recorder.lang >> apps.lang
 cat gstreamer-properties.lang >> apps.lang
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
@@ -272,12 +271,13 @@ gtk-update-icon-cache --quiet %{_datadir
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING NEWS README
-%{_bindir}/gnome-volume-control
 %{_bindir}/gnome-volume-control-applet
 %{_bindir}/gnome-audio-profiles-properties
+%{_libdir}/control-center-1/panels/libsound.so
 %{_sysconfdir}/xdg/autostart/gnome-volume-control-applet.desktop
 %{_datadir}/applications/gnome-volume-control.desktop
-%{_datadir}/icons/hicolor/*/apps/gnome-volume-control*
+%{_datadir}/icons/hicolor/*/apps/multimedia-volume-control.*
+%{_datadir}/icons/hicolor/*/status/audio-input-microphone*
 %{_datadir}/gnome-media
 %{_datadir}/sounds/gnome/
 
@@ -291,8 +291,8 @@ gtk-update-icon-cache --quiet %{_datadir
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
-%{_libdir}/glade3/modules/libgnome-media-profiles.so
-%{_datadir}/glade3/catalogs/gnome-media-profiles.xml
+#%{_libdir}/glade3/modules/libgnome-media-profiles.so
+#%{_datadir}/glade3/catalogs/gnome-media-profiles.xml
 
 %files apps -f apps.lang
 %defattr(-, root, root)