Attachment 247201 Details for Bug 327211 – totem.spec patch for 2.21.1

[patch] totem.spec patch for 2.21.1

totem.patch (text/plain), 11.60 KB, created by Stewart Adam on 2007-11-03 05:49:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stewart Adam

Created: 2007-11-03 05:49:11 UTC

Size: 11.60 KB

patch

obsolete

>? totem.patch
>? totem.spec.merged
>Index: totem.spec
>===================================================================
>RCS file: /cvs/extras/rpms/totem/devel/totem.spec,v
>retrieving revision 1.129
>diff -u -p -r1.129 totem.spec
>--- totem.spec	31 Oct 2007 10:33:07 -0000	1.129
>+++ totem.spec	3 Nov 2007 05:48:34 -0000
>@@ -1,16 +1,29 @@
>-%define gstreamer_version	0.10.1
>-%define gstreamer_plugins_base_version	0.10.14-3
>-%define gstreamer_plugins_good_version	0.10.0
>-%define gtk2_version	2.12.1
>+# for testing... When submitting to buildsys, leave these as 1
>+%define with_gstreamer 1
>+%define with_xine 1
>+
>+%define mozillaplugindir %{_libdir}/mozilla/plugins
>+%define schemas totem.schemas totem-handlers.schemas totem-video-thumbnail.schemas
>+
>+# Use these gstreamer versions
>+%define gstreamer_version  0.10.1
>+%define gstreamer_plugins_base_version  0.10.14-3
>+%define gstreamer_plugins_good_version  0.10.0
>+%define gtk2_version  2.12.1
>+
>+# use these xine versions
>+%define xine_version 1.1.7
> 
> Summary: Movie player for GNOME 2
> Name: totem
> Version: 2.21.1
>-Release: 1%{?dist} 
>-License: GPLv2 with exception
>+Release: 2%{?dist} 
>+License: GPLv2 with exceptions
> Group: Applications/Multimedia
> URL: http://www.gnome.org/projects/totem/
> Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.21/totem-%{version}.tar.bz2
>+Source1: totem-bin-backend-ondemand.sh
>+Patch0: totem-2.21.1-backend-schema.patch
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
> 
> Requires(pre): GConf2 >= 2.14
>@@ -30,10 +43,8 @@ Requires: gnome-themes
> Requires: %{name}-plparser = %{version}-%{release}
> Requires: gtk2 >= %gtk2_version
> 
>+Requires: %{name}-backend = %{version}-%{release}
> BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper
>-BuildRequires: gstreamer-devel >= %gstreamer_version
>-BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
>-BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
> BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel
> BuildRequires: perl(XML::Parser)
> BuildRequires: iso-codes-devel
>@@ -59,6 +70,36 @@ Totem is simple movie player for the Gno
> simple playlist, a full-screen mode, seek and volume controls, as well as
> a pretty complete keyboard navigation.
> 
>+%if %{with_gstreamer}
>+%package gstreamer
>+Summary: Gstreamer backend for Totem
>+Group: Applications/Multimedia
>+Provides: %{name}-backend
>+Requires: %{name} = %{version}
>+Requires: gstreamer >= %gstreamer_version
>+Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
>+Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
>+BuildRequires: gstreamer-devel >= %gstreamer_version
>+BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
>+BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
>+
>+%description gstreamer
>+This package provides the gstreamer backend for the Totem media player.
>+%endif
>+
>+%if %{with_xine}
>+%package xine
>+Summary: Gstreamer backend for Totem
>+Group: Applications/Multimedia
>+Provides: %{name}-backend
>+Requires: %{name} = %{version}
>+Requires: xine-lib >= %{xine_version}
>+BuildRequires: xine-lib-devel >= %{xine_version}
>+
>+%description xine
>+This package provides the xine backend for the Totem media player.
>+%endif
>+
> %package mozplugin
> Summary: Mozilla plugin for Totem
> Group: Applications/Internet
>@@ -71,6 +112,7 @@ for totem allows totem to be embeded int
> Summary: Totem playlist parser library
> License: LGPLv2+
> Group: Development/Libraries
>+Obsoletes: totem-xine-plparser
> 
> %description plparser
> A library to parse various forms of music playlists.
>@@ -135,26 +177,91 @@ applications with Totem's plparser libra
> 
> 
> %prep
>-%setup -q
>+%setup -q -c
>+# Whatever needs to be changed in both copies do first
>+
>+# remember to update me when changing %doc
>+for i in AUTHORS COPYING NEWS README TODO;do
>+  mv totem-%{version}/$i .
>+done
>+
>+pushd totem-%{version}
>+%patch0 -b .patch0
>+popd
>+
>+# duplicate sources
>+cp -a totem-%{version} xine
>+mv totem-%{version} gstreamer
> 
> %build
>-# try to work around a problem where gst-inspect does 
>-# not find playbin the first time around
>-/usr/bin/gst-inspect-0.10 --print-all > /dev/null
> export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins
>-%configure 			\
>-	--enable-gstreamer 	\
>-	--enable-mozilla 	\
>-	--enable-nautilus	\
>-	--disable-scrollkeeper  \
>-	--disable-nvtv
>+
>+%if %{with_gstreamer}
>+pushd gstreamer
>+ # try to work around a problem where gst-inspect does 
>+ # not find playbin the first time around
>+ /usr/bin/gst-inspect-0.10 --print-all > /dev/null
>+%configure       \
>+  --enable-gstreamer   \
>+  --disable-xine \
>+  --enable-mozilla   \
>+  --enable-nautilus  \
>+  --disable-scrollkeeper  \
>+  --disable-nvtv \
>+  --program-suffix '-gstreamer'
>+
>+make %{?_smp_mflags}
>+popd
>+%endif
>+
>+%if %{with_xine}
>+pushd xine
>+# works around a bug where xine compilation fails due to gnome-keyring.h not
>+# being found
>+export CFLAGS="-I/usr/include/gnome-keyring-1/"
>+%configure \
>+  --enable-xine \
>+  --disable-gstreamer \
>+  --enable-mozilla   \
>+  --enable-nautilus  \
>+  --disable-scrollkeeper  \
>+  --disable-nvtv \
>+  --program-suffix '-xine'
> 
> make %{?_smp_mflags}
>+popd
>+%endif
> 
> %install
> rm -rf $RPM_BUILD_ROOT
> export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
>+
>+%if %{with_gstreamer}
>+# GSTREAMER INSTALL
>+pushd gstreamer/
>+make install DESTDIR=$RPM_BUILD_ROOT
>+%find_lang %{name} --with-gnome
>+mv %{name}.lang ../
>+# nautilus plugin doesn't use --program-suffix :/
>+# copy manually
>+install -m755 ./src/.libs/libtotem-properties-page.so $RPM_BUILD_ROOT%{_libdir}/libtotem-properties-page-gstreamer.so
>+popd
>+%endif
>+
>+%if %{with_xine}
>+# XINE INSTALL
>+pushd xine
> make install DESTDIR=$RPM_BUILD_ROOT
>+# nautilus plugin doesn't use --program-suffix :/
>+# copy manually
>+install -m755 ./src/.libs/libtotem-properties-page.so $RPM_BUILD_ROOT%{_libdir}/libtotem-properties-page-xine.so
>+popd
>+%endif
>+
>+# nautilus plugin doesn't use --program-suffix :/
>+# remove binary file so we can symlink it
>+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/libtotem-properties-page.so
>+ln -sf ../../libtotem-properties-page-gstreamer.so $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/libtotem-properties-page.so
> 
> %find_lang %{name} --with-gnome
> 
>@@ -162,6 +269,20 @@ make install DESTDIR=$RPM_BUILD_ROOT
> find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
> find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
> 
>+# these man pages are one and the same... so make one copy
>+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{name}*xine*
>+mv $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-gstreamer.1 \
>+  $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
>+mv $RPM_BUILD_ROOT%{_mandir}/man1/totem-video-thumbnailer-gstreamer.1 \
>+  $RPM_BUILD_ROOT%{_mandir}/man1/totem-video-thumbnailer.1
>+
>+install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
>+# link other binaries
>+ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-video-thumbnailer
>+ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-video-indexer
>+ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-audio-preview
>+ln -sf %{name}-plugin-viewer-gstreamer $RPM_BUILD_ROOT%{_libexecdir}/%{name}-plugin-viewer
>+
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>@@ -171,10 +292,10 @@ 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 || :
>+        %{_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
>@@ -183,21 +304,21 @@ fi
> %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 || :
>+    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
>  
> %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 || :
>+    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
>  
> %postun
>@@ -209,14 +330,18 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
>   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
> fi
> 
>+
> %files -f %{name}.lang
> %defattr(-,root,root,-)
> %doc AUTHORS COPYING NEWS README TODO
> %config %{_sysconfdir}/gconf/schemas/*.schemas
>-%{_bindir}/%{name}
> %{_datadir}/applications/%{name}.desktop
> %{_datadir}/%{name}/
>-%{_libdir}/nautilus/extensions-1.0/*.so*
>+%{_bindir}/%{name}
>+%{_bindir}/%{name}-video-thumbnailer
>+%{_bindir}/%{name}-video-indexer
>+%{_bindir}/%{name}-audio-preview
>+%{_libdir}/nautilus/extensions-1.0/libtotem-properties-page.so
> %dir %{_libdir}/totem/plugins
> %{_libdir}/totem/plugins/gromit
> %{_libdir}/totem/plugins/ontop
>@@ -226,14 +351,31 @@ fi
> %{_libdir}/totem/plugins/media-player-keys
> %{_libdir}/totem/plugins/totem
> #%{_libdir}/totem/plugins/bemused
>-%{_bindir}/%{name}-video-thumbnailer
>-%{_bindir}/%{name}-video-indexer
>-%{_bindir}/%{name}-audio-preview
> %{_datadir}/icons/hicolor/*/apps/totem.png
> %{_datadir}/icons/hicolor/scalable/apps/totem.svg
> %{_mandir}/man1/%{name}.1*
> %{_mandir}/man1/totem-video-thumbnailer.1.gz
> 
>+%if %{with_gstreamer}
>+%files gstreamer
>+%{_bindir}/%{name}-gstreamer
>+%{_bindir}/%{name}-video-thumbnailer-gstreamer
>+%{_bindir}/%{name}-video-indexer-gstreamer
>+%{_bindir}/%{name}-audio-preview-gstreamer
>+%{_libdir}/libtotem-properties-page-gstreamer.so
>+%{_libexecdir}/totem-plugin-viewer-gstreamer
>+%endif
>+
>+%if %{with_xine}
>+%files xine
>+%{_bindir}/%{name}-xine
>+%{_bindir}/%{name}-video-thumbnailer-xine
>+%{_bindir}/%{name}-video-indexer-xine
>+%{_bindir}/%{name}-audio-preview-xine
>+%{_libdir}/libtotem-properties-page-xine.so
>+%{_libexecdir}/totem-plugin-viewer-xine
>+%endif
>+
> %files galago
> %defattr(-, root, root)
> %{_libdir}/totem/plugins/galago
>@@ -263,9 +405,22 @@ fi
> %defattr(-, root, root)
> %{_includedir}/%{name}
> %{_libdir}/pkgconfig/*.pc
>-%{_libdir}/*so
>+%{_libdir}/libtotem-plparser.so
> 
> %changelog
>+* Fri Nov 2 2007 - Stewart Adam <s.adam@diffingo.com> - 2.21.1-2
>+- Link the switcher script to mozilla plugin and nautilus plugin too
>+- Use `ln -sf` so that future install don't generate errors as we link
>+- Use totem-bin-backend-ondemand.sh for the gconf-based switching
>+- Add configurable gconf value for backend selection
>+- Merge totem and totem-xine specs
>+- Compile twice for each backend
>+- No duplicate files in /usr/lib/
>+
>+* Wed Oct 31 2007 - Bastien Nocera <bnocera@redhat.com> - 2.21.1-1
>+- Update to 2.21.1
>+
>+
> * Wed Oct 31 2007 - Bastien Nocera <bnocera@redhat.com> - 2.21.1-1
> - Update to 2.21.1
>

Actions: View | Diff

Attachments on bug 327211: 223871 | 223881 | 223891 | 226231 | 226241 | 226251 | 226281 | 233441 | 247201 | 247211 | 296650 | 296651 | 296652 | 296663 | 296927 | 297066 | 297070 | 297102 | 298004 | 298705