rpms/totem/OLPC-3 sources,1.61,1.62 totem.spec,1.189,1.190
Dennis Gilmore (ausil)
fedora-extras-commits at redhat.com
Wed Jul 2 20:00:33 UTC 2008
Author: ausil
Update of /cvs/pkgs/rpms/totem/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5088
Modified Files:
sources totem.spec
Log Message:
define minimal build, based on rawhide version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/OLPC-3/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources 22 Apr 2008 23:48:57 -0000 1.61
+++ sources 2 Jul 2008 19:59:41 -0000 1.62
@@ -1 +1 @@
-118b9b3030814872697505ef1e1b0b96 totem-2.23.2.tar.bz2
+e90839bbac5b7b663a1ddc74646ded99 totem-2.23.4.tar.bz2
Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/OLPC-3/totem.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- totem.spec 27 Jun 2008 15:08:53 -0000 1.189
+++ totem.spec 2 Jul 2008 19:59:41 -0000 1.190
@@ -1,17 +1,17 @@
%define with_xine 0
+%define minimal_build 1
%define gstreamer_version 0.10.1
%define gstreamer_plugins_base_version 0.10.17.2-4
%define gstreamer_plugins_good_version 0.10.0
%define gstreamer_plugins_flumpegdemux_version 0.10.15
%define gtk2_version 2.12.1
-%define gecko_version 1.9
%define xine_version 1.1.7
Summary: Movie player for GNOME
Name: totem
-Version: 2.23.2
-Release: 4%{?dist}.1
+Version: 2.23.4
+Release: 1%{?dist}.1
License: GPLv2 with exception
Group: Applications/Multimedia
URL: http://www.gnome.org/projects/totem/
@@ -27,19 +27,20 @@
Requires(postun): desktop-file-utils
Requires(postun): scrollkeeper
+%if %{minimal_build} == 0
Requires: gnome-desktop >= 2.6.0
-Requires: iso-codes
Requires: gnome-themes
+%endif
+Requires: iso-codes
Requires: gtk2 >= %gtk2_version
# FIXME?
#Requires: %{name}-backend = %{version}-%{release}
Requires: %{name}-gstreamer
BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper
-BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel
+BuildRequires: gnome-desktop-devel >= 2.6.0, libglade2-devel
BuildRequires: perl(XML::Parser)
BuildRequires: iso-codes-devel
-BuildRequires: gecko-devel-unstable = %gecko_version
BuildRequires: gnome-icon-theme
BuildRequires: nautilus-devel
BuildRequires: libXtst-devel
@@ -57,14 +58,8 @@
BuildRequires: libepc-devel
BuildRequires: totem-pl-parser-devel
-# For the xulrunner patch
-BuildRequires: intltool autoconf automake libtool gettext check-devel
-
Obsoletes: nautilus-media
-# http://bugzilla.gnome.org/show_bug.cgi?id=458324
-Patch0: totem-xul-4.patch
-
%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
@@ -80,6 +75,7 @@
Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
Requires: gstreamer-plugins-flumpegdemux >= %gstreamer_plugins_flumpegdemux_version
+Requires: gvfs-fuse
BuildRequires: gstreamer-devel >= %gstreamer_version
BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
@@ -95,6 +91,7 @@
Provides: %{name}-backend = %{version}-%{release}
Requires: %{name} = %{version}
Requires: xine-lib >= %{xine_version}
+Requires: gvfs-fuse
BuildRequires: xine-lib-devel >= %{xine_version}
%description xine
@@ -104,7 +101,6 @@
%package mozplugin
Summary: Mozilla plugin for Totem
Group: Applications/Internet
-Requires: gecko-libs = %gecko_version
%description mozplugin
Totem is simple movie player for the Gnome desktop. The mozilla plugin
@@ -130,6 +126,7 @@
Your Instant Messenging program might require a plugin to take
advantage of this feature.
+%if %{minimal_build} == 0
%package mythtv
Summary: MythTV plugin for Totem
Group: Applications/Multimedia
@@ -137,6 +134,7 @@
%description mythtv
A plugin to allow access to recordings on a remote MythTV server.
+%endif
%package youtube
Summary: YouTube plugin for Totem
@@ -168,6 +166,7 @@
A plugin to allow you to share your current playlist (and the files included
in that playlist) with other Totems on the same local network.
+%if %{minimal_build} == 0
%package nautilus
Summary: Video and Audio Properties tab for Nautilus
Group: Applications/Multimedia
@@ -180,6 +179,7 @@
%description nautilus
A Nautilus extension that shows the properties of audio and video files in•
the properties dialogue.
+%endif
%prep
%setup -q -c
@@ -189,14 +189,6 @@
cp totem-%{version}/$i .
done
-pushd totem-%{version}
-%patch0 -p0 -b .xulrunner
-
-# regen
-automake
-autoconf
-popd
-
# duplicate sources
cp -a totem-%{version} xine
mv totem-%{version} gstreamer
@@ -206,17 +198,32 @@
pushd gstreamer
# try to work around a problem where gst-inspect does
# not find playbin the first time around
-DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
+DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all # > /dev/null
export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins
%configure \
+%if %{minimal_build} == 0
--enable-gstreamer \
- --disable-lirc \
- --disable-vanity \
--enable-mozilla \
+ --enable-nautilus \
+ --disable-scrollkeeper \
+ --disable-nvtv
+%else
+ --enable-gstreamer \
+ --enable-mozilla \
+ --disable-lirc \
+ --disable-vanity \
--disable-nautilus \
--disable-scrollkeeper \
--disable-nvtv \
+ --disable-youtube \
+ --disable-publish \
+ --disable-skipto \
+ --disable-screensaver \
+ --disable-tracker \
+ --with-dbus \
--enable-gtk
+%endif
+
make %{?_smp_mflags}
popd
@@ -296,7 +303,7 @@
%post xine
/usr/sbin/alternatives --install %{_libdir}/libbaconvideowidget.so.0.0.0 totem-backend %{_libdir}/libbaconvideowidget-xine.so.0.0.0 1
/sbin/ldconfig
-%endif
+%endif
%pre
if [ "$1" -gt 1 ]; then
@@ -340,12 +347,7 @@
/sbin/ldconfig
%endif
-%post mythtv
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas \
- >& /dev/null || :
-
+%if %{minimal_build} == 0
%pre mythtv
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -365,6 +367,7 @@
>& /dev/null || :
fi
fi
+%endif
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -397,9 +400,11 @@
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/totem-video-thumbnailer.1.gz
+%if %{minimal_build} == 0
%files nautilus
%defattr(-, root, root)
%{_libdir}/nautilus/extensions-2.0/*.so*
+%endif
%files galago
%defattr(-, root, root)
@@ -409,10 +414,11 @@
%defattr(-, root, root)
%{_libdir}/totem/plugins/lirc
+%if %{minimal_build} == 0
%files mythtv
%defattr(-, root, root)
-%config %{_sysconfdir}/gconf/schemas/totem-mythtv.schemas
%{_libdir}/totem/plugins/mythtv
+%endif
%files youtube
%defattr(-, root, root)
@@ -440,21 +446,28 @@
%endif
%changelog
-* Fri Jun 27 2008 Dennis Gilmore <dennis at ausil.us> - 2.23.2-4.1
-- fix up disabling xine
-- disable xine
-- disable gnome
+* Wed Jul 02 2008 - Dennis Gilmore <dennis at laptop.org> - 2.23.4-1.1
+- setup macros to define a minimal gtk only build
+- disable xine backend for OLPC minimal build
+
+* Wed Jun 11 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.4-1
+- Update to 2.23.4
+- Remove gnome-vfs BRs
+- Remove xulrunner patches and requires, we don't need them anymore
+
+* Sat May 17 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.3-2
+- Rebuild
-* Wed Jun 18 2008 Owen Taylor <otaylor at redhat.com> - 2.23.2-4
-- Rebuild against xulrunner 1.9 final
+* Wed May 14 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.3-1
+- Update to 2.23.3
+
+* Tue May 13 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.2-4
+- Rebuild
* Wed May 07 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.2-3
- Require gstreamer-plugins-flumpegdemux as used by the DVB and DVD
playback bits
-* Wed Apr 23 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.2-2
-- Rebuild
-
* Mon Apr 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.2-1
- Update to 2.23.2
- Fix scriptlets removing the alternatives on upgrade (#442895)
More information about the fedora-extras-commits
mailing list