[gnome-media] - Update to 2.91.2
Bastien Nocera
hadess at fedoraproject.org
Fri Nov 12 17:25:40 UTC 2010
commit 03d1e5dd959304c1852cbebd8181d2c4f04ac5e8
Author: Bastien Nocera <hadess at hadess.net>
Date: Fri Nov 12 17:25:34 2010 +0000
- Update to 2.91.2
.gitignore | 1 +
gnome-media.spec | 85 ++++-------------------------------------------------
sources | 2 +-
3 files changed, 9 insertions(+), 79 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 648716d..aa78a23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
gnome-media-2.31.5.tar.bz2
/gnome-media-2.31.5.58-146c.tar.bz2
/gnome-media-2.91.0.tar.bz2
+/gnome-media-2.91.2.tar.bz2
diff --git a/gnome-media.spec b/gnome-media.spec
index b0ad939..b74961d 100644
--- a/gnome-media.spec
+++ b/gnome-media.spec
@@ -11,7 +11,7 @@
Summary: GNOME media programs
Name: gnome-media
-Version: 2.91.0
+Version: 2.91.2
Release: 1%{?dist}
License: GPLv2+ and GFDL
Group: Applications/Multimedia
@@ -36,6 +36,7 @@ BuildRequires: gstreamer-plugins-good-devel
BuildRequires: dbus-glib-devel
BuildRequires: libcanberra-devel
BuildRequires: pulseaudio-libs-devel
+BuildRequires: libgnome-media-profiles-devel
BuildRequires: gnome-doc-utils
BuildRequires: intltool
BuildRequires: control-center-devel
@@ -45,25 +46,6 @@ BuildRequires: scrollkeeper
This package contains a few media utilities for the GNOME desktop,
including a volume control and a configuration utility for audio profiles.
-%package devel
-Summary: Development files for gnome-media
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: glade3-libgladeui-devel
-
-%description devel
-This package contains the libraries and header files necessary to
-develop GNOME media applications.
-
-%package libs
-Summary: Libraries for gnome-media
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-This package contains the libraries required for using encoding profiles
-in GNOME media applications.
-
%package apps
Summary: Some media-related applications for the GNOME desktop
Group: Applications/Multimedia
@@ -77,15 +59,12 @@ framework.
%prep
%setup -q
-# force regeneration
-rm profiles/gnome-audio-profiles.schemas
-
%build
%configure \
--disable-schemas-install \
--enable-gnomecd=no \
--enable-cddbslave=no
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
# strip unneeded translations from .mo files
# ideally intltool (ha!) would do that for us
@@ -115,9 +94,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/vumeter.desktop
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/reclevel.desktop
rm -f $RPM_BUILD_ROOT%{_bindir}/vumeter
-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
@@ -138,7 +114,6 @@ for helpdir in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*; do
done
%find_lang %{gettext_package}
-%find_lang gnome-audio-profiles --with-gnome
%find_lang gnome-sound-recorder --with-gnome
%find_lang gstreamer-properties --with-gnome
cat gnome-audio-profiles.lang >> apps.lang
@@ -155,13 +130,6 @@ gconftool-2 --makefile-install-rule \
> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-%post libs
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
- > /dev/null || :
-/sbin/ldconfig
-
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -183,14 +151,6 @@ if [ "$1" -gt 1 ]; then
fi
fi
-%pre libs
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
- > /dev/null || :
-fi
-
%pre apps
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -232,24 +192,12 @@ if [ "$1" -gt 1 ]; then
fi
fi
-%preun libs
-if [ "$1" -eq 0 ]; then
- if [ -f %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas ] ; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas \
- > /dev/null || :
- fi
-fi
-
%postun
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
fi
-%postun libs -p /sbin/ldconfig
-
%postun apps
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
@@ -262,31 +210,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
%posttrans apps
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
-%files
+%files -f %{gettext_package}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README
-%{_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/multimedia-volume-control.*
-%{_datadir}/icons/hicolor/*/status/audio-input-microphone*
-%{_datadir}/gnome-media
-%{_datadir}/sounds/gnome/
-
-%files libs -f %{gettext_package}.lang
-%defattr(-, root, root)
-%config %{_sysconfdir}/gconf/schemas/gnome-audio-profiles.schemas
-%{_libdir}/*.so.*
-
-%files devel
-%defattr(-, root, root)
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
-#%{_libdir}/glade3/modules/libgnome-media-profiles.so
-#%{_datadir}/glade3/catalogs/gnome-media-profiles.xml
%files apps -f apps.lang
%defattr(-, root, root)
@@ -303,6 +229,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
%changelog
+* Wed Nov 10 2010 Bastien Nocera <bnocera at redhat.com> 2.91.2-1
+- Update to 2.91.2
+
* Mon Oct 18 2010 Bastien Nocera <bnocera at redhat.com> 2.91.0-1.
- Update to 2.91.0
diff --git a/sources b/sources
index d38d5cb..f46cd96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4867384ef42fdce3a62a2ecc81593b39 gnome-media-2.91.0.tar.bz2
+06caa0ae6be9a1ecc64a03002aeb093c gnome-media-2.91.2.tar.bz2
More information about the scm-commits
mailing list