Attachment 297102 Details for Bug 327211 – Adds the required 'alternatives' commands

[patch] Adds the required 'alternatives' commands

totem-2.23.0-alternatives.patch (text/plain), 3.87 KB, created by Stewart Adam on 2008-03-06 20:57:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stewart Adam

Created: 2008-03-06 20:57:40 UTC

Size: 3.87 KB

patch

obsolete

>? totem-2.23.0-alternatives.patch
>? x86_64
>Index: totem-bin-backend-ondemand.sh
>===================================================================
>RCS file: /cvs/extras/rpms/totem/devel/totem-bin-backend-ondemand.sh,v
>retrieving revision 1.2
>diff -u -r1.2 totem-bin-backend-ondemand.sh
>--- totem-bin-backend-ondemand.sh	5 Mar 2008 00:00:03 -0000	1.2
>+++ totem-bin-backend-ondemand.sh	6 Mar 2008 20:54:31 -0000
>@@ -28,9 +28,14 @@
> 		echo "*** Invalid backend name ***"
> 		usage
> 	fi
>-
>-	# FIXME if someone can explain update-alternatives to me
>-
>+  _LIBDIR="$(rpm --eval '%{_libdir}')"
>+  if [[ -f $_LIBDIR/libbaconvideowidget-xine.so.0.0.0 && -f $_LIBDIR/libbaconvideowidget-gstreamer.so.0.0.0 ]];then
>+    # only if both files exist
>+    /usr/sbin/alternatives --set totem-backend $_LIBDIR/libbaconvideowidget-$TOTEM_BACKEND.so.0.0.0
>+  else
>+    echo -e 'Error: One or both of the libbaconvideowidget files not found!\nPlease check your totem installation.'
>+    exit 1
>+  fi
> 	exit 0
> }
> # end functions
>@@ -64,4 +69,3 @@
> 	shift 3
> 	LD_PRELOAD=libgdk-x11-2.0.so.0:libbaconvideowidget-$TOTEM_BACKEND.so.0.0.0 exec $BIN "$@"
> fi
>-
>Index: totem.spec
>===================================================================
>RCS file: /cvs/extras/rpms/totem/devel/totem.spec,v
>retrieving revision 1.169
>diff -u -r1.169 totem.spec
>--- totem.spec	5 Mar 2008 12:11:23 -0000	1.169
>+++ totem.spec	6 Mar 2008 20:54:32 -0000
>@@ -10,7 +10,7 @@
> Summary: Movie player for GNOME
> Name: totem
> Version: 2.23.0
>-Release: 1%{?dist} 
>+Release: 2%{?dist} 
> License: GPLv2 with exception
> Group: Applications/Multimedia
> URL: http://www.gnome.org/projects/totem/
>@@ -252,9 +252,6 @@
> popd
> %endif
> 
>-# Restore the default backend
>-ln -sf %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget.so.0.0.0
>-
> rm -f $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{a,la} \
>  $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.{a,la} \
>  $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la} \
>@@ -280,10 +277,17 @@
> if [ -x /usr/bin/gtk-update-icon-cache ]; then
>   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
> fi
>+# works around %{_libdir}/libbaconvideowidget.so.0.0.0 pointing to xine (and
>+# therefore alternatives setup is ignored)
>+/sbin/ldconfig
> 
>-%post gstreamer -p /sbin/ldconfig
>+%post gstreamer
>+/sbin/ldconfig
>+/usr/sbin/alternatives --install %{_libdir}/libbaconvideowidget.so.0.0.0 totem-backend %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 2
> 
>-%post xine -p /sbin/ldconfig
>+%post xine
>+/sbin/ldconfig
>+/usr/sbin/alternatives --install %{_libdir}/libbaconvideowidget.so.0.0.0 totem-backend %{_libdir}/libbaconvideowidget-xine.so.0.0.0 1
> 
> %pre
> if [ "$1" -gt 1 ]; then
>@@ -314,9 +318,14 @@
>   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
> fi
> 
>-%postun gstreamer -p /sbin/ldconfig
>+%postun gstreamer
>+/sbin/ldconfig
>+/usr/sbin/alternatives --remove totem-backend %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0
>+
>+%postun xine
>+/sbin/ldconfig
>+/usr/sbin/alternatives --remove totem-backend %{_libdir}/libbaconvideowidget-xine.so.0.0.0
> 
>-%postun xine -p /sbin/ldconfig
> 
> %post mythtv
> export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
>@@ -407,7 +416,6 @@
> %{_libdir}/totem/plugins/publish
> 
> %files gstreamer
>-%{_libdir}/libbaconvideowidget.so.0.0.0
> %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0
> 
> %if %{with_xine}
>@@ -416,6 +424,12 @@
> %endif
> 
> %changelog
>+* Thu Mar 06 2008 - Stewart Adam <s.adam@diffingo.com> - 2.23.0-2
>+- Use alternatives to switch the backend symlink when root
>+- Call ldconfig on main totem package to regen libbaconvideowidget.so.0
>+- Don't package libbaconvideowidget-xine.so.0.0.0, alternatives takes care of
>+  this file (and removes it too)
>+
> * Tue Mar 04 2008 - Bastien Nocera <bnocera@redhat.com> - 2.23.0-1
> - Update to 2.23.0, rework the -gstreamer/-xine backend split to
>   switch libraries instead of having replacements for all the

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