- Merge-review cleanup (#226500)

This commit is contained in:
paragn 2010-10-05 10:31:30 +05:30
parent 3af6c1a22b
commit 44a6628791

View File

@ -1,7 +1,3 @@
%define gstreamer_version 0.10.26
%define gstreamer_plugins_base_version 0.10.26
%define gstreamer_plugins_good_version 0.10.18
%define gstreamer_plugins_bad_free_version 0.10.17
# coherence_upnp currently fails to build in rawhide with:
# configure: WARNING: the coherence_upnp plugin uses PyGTK and conflicts with the new pygobject bindings (disabling plugin)
@ -13,7 +9,7 @@
Summary: Movie player for GNOME
Name: totem
Version: 2.90.5
Release: 7%{?dist}
Release: 8%{?dist}
Epoch: 1
License: GPLv2+ with exceptions
Group: Applications/Multimedia
@ -27,11 +23,9 @@ Source0: http://download.gnome.org/sources/totem/2.90/totem-%{version}.tar.bz2
# rhbz#618791
Patch0: fix-libpeas-0.5.3-api-changes.patch
Requires(pre): GConf2 >= 2.14
Requires(preun): GConf2 >= 2.14
Requires(post): GConf2 >= 2.14
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires(pre): GConf2
Requires(preun): GConf2
Requires(post): GConf2
Requires: iso-codes
Requires: gnome-icon-theme
@ -44,17 +38,17 @@ Requires: python-httplib2
Requires: python-BeautifulSoup
Requires: python-feedparser
Requires: gstreamer >= %gstreamer_version
Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
Requires: gstreamer-plugins-bad-free >= %gstreamer_plugins_bad_free_version
Requires: gstreamer
Requires: gstreamer-plugins-base
Requires: gstreamer-plugins-good
Requires: gstreamer-plugins-bad-free
Requires: gvfs-fuse
Requires: gnome-dvb-daemon
BuildRequires: gstreamer-devel >= %gstreamer_version
BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
BuildRequires: liboil >= 0.3.13-5
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
BuildRequires: gstreamer-plugins-good
BuildRequires: liboil
BuildRequires: libpeas-devel
BuildRequires: gcc-c++, pkgconfig, gettext
@ -89,13 +83,6 @@ BuildRequires: libgdata-devel
BuildRequires: autoconf automake libtool
BuildRequires: gnome-common
Obsoletes: nautilus-media < 0.8.2
Provides: nautilus-media = %{epoch}:%{version}-%{release}
Obsoletes: totem-gstreamer < 2.27.1
Provides: totem-gstreamer = %{epoch}:%{version}-%{release}
Obsoletes: totem-xine < 2.27.1
Provides: totem-xine = %{epoch}:%{version}-%{release}
%description
Totem is simple movie player for the GNOME desktop. It features a
simple playlist, a full-screen mode, seek and volume controls, as well as
@ -194,10 +181,6 @@ developing developing plugins for %{name}.
Summary: Video and Audio Properties tab for Nautilus
Group: Applications/Multimedia
Requires: %{name} = %{epoch}:%{version}-%{release}
Provides: totem-nautilus-xine = %{epoch}:%{version}-%{release}
Provides: totem-nautilus-gstreamer = %{epoch}:%{version}-%{release}
Obsoletes: totem-nautilus-xine < 2.23.0
Obsoletes: totem-nautilus-gstreamer < 2.23.0
%description nautilus
This package provides a Nautilus extension that shows the properties of
@ -224,10 +207,9 @@ export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name} --with-gnome
rm -rf $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{a,la} \
@ -259,70 +241,35 @@ done
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%clean
rm -rf $RPM_BUILD_ROOT
%post
scrollkeeper-update -q
update-desktop-database -q
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
%{_sysconfdir}/gconf/schemas/totem.schemas \
%{_sysconfdir}/gconf/schemas/totem-handlers.schemas \
%{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \
>& /dev/null || :
touch %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
update-desktop-database &> /dev/null || :
%gconf_schema_upgrade totem totem-handlers totem-video-thumbnail
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/totem.schemas \
%{_sysconfdir}/gconf/schemas/totem-handlers.schemas \
%{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \
>& /dev/null || :
fi
%gconf_schema_prepare totem totem-handlers totem-video-thumbnail
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/totem.schemas \
%{_sysconfdir}/gconf/schemas/totem-handlers.schemas \
%{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas \
>& /dev/null || :
fi
%gconf_schema_remove totem totem-handlers.schemas totem-video-thumbnail
%postun
scrollkeeper-update -q
update-desktop-database -q
touch %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%pre mythtv
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
if [ -f %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas ] ; then
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \
>& /dev/null || :
fi
fi
%gconf_schema_prepare totem-mythtv
%preun mythtv
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
if [ -f %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas ] ; then
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \
>& /dev/null || :
fi
fi
%gconf_schema_remove totem-mythtv
%post mythtv
%gconf_schema_upgrade totem-mythtv
%files -f %{name}.lang
%defattr(-,root,root,-)
@ -365,33 +312,33 @@ fi
%{_mandir}/man1/totem-video-thumbnailer.1.gz
%files nautilus
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_libdir}/nautilus/extensions-2.0/*.so*
%files lirc
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_libdir}/totem/plugins/lirc
%files mythtv
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_libdir}/totem/plugins/mythtv
%files youtube
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_libdir}/totem/plugins/youtube
%files jamendo
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_libdir}/totem/plugins/jamendo
%if 0%{with_coherence_upnp}
%files upnp
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_libdir}/totem/plugins/coherence_upnp
%endif
%files devel
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_datadir}/gtk-doc/html/totem
%{_includedir}/totem
%{_libdir}/libtotem.so
@ -403,15 +350,18 @@ fi
#%{_libdir}/totem/plugins/tracker
%files mozplugin
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_libdir}/mozilla/plugins/*
%{_libexecdir}/totem-plugin-viewer
%files publish
%defattr(-, root, root)
%defattr(-, root, root,-)
%{_libdir}/totem/plugins/publish
%changelog
* Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> 2.90.5-8
- Merge-review cleanup (#226500)
* Wed Sep 22 2010 Matthias Clasen <mclasen@redhat.com> 2.90.5-7
- Rebuild against newer gobject-introspection