commit totem for openSUSE:Factory
Hello community, here is the log from the commit of package totem for openSUSE:Factory checked in at Wed Dec 29 00:34:21 CET 2010. -------- --- GNOME/totem/totem.changes 2010-09-27 17:33:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/totem/totem.changes 2010-11-24 16:58:23.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 24 15:57:10 UTC 2010 - badshah400@gmail.com + +- Added upstream patches totem-URI-scheme-handler-support.patch and + totem-fix-scheme-handler.patch to fix URI scheme handler support + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- totem-URI-scheme-handler-support.patch totem-fix-scheme-handler.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.1DqMmf/_old 2010-12-29 00:33:59.000000000 +0100 +++ /var/tmp/diff_new_pack.1DqMmf/_new 2010-12-29 00:33:59.000000000 +0100 @@ -22,11 +22,15 @@ License: GPLv2+ ; LGPLv2.1+ Group: Productivity/Multimedia/Video/Players Version: 2.32.0 -Release: 1 +Release: 2 # FIXME: add gnome-dvb-daemon Suggests/Recommends when we'll have it? Url: http://www.gnome.org/projects/totem/ Summary: Movie Player for the GNOME Desktop Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM totem-URI-scheme-handler-support.patch badshah400@gmail.com -- Add support for URI scheme handlers, taken from git +Patch0: totem-URI-scheme-handler-support.patch +# PATCH-FIX-UPSTREAM totem-URI-scheme-handler-support.patch badshah400@gmail.com -- Fix URI scheme handler support, taken from git +Patch1: totem-fix-scheme-handler.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-common @@ -159,7 +163,7 @@ %package devel License: GPLv2+ ; LGPLv2.1+ Summary: Developer Documentation for Totem Movie Player -Group: Productivity/Multimedia/Video/Players +Group: Development/Libraries/GNOME Requires: %{name} = %{version} %description devel @@ -170,6 +174,8 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build # FIXME: Build as root modifies system! ++++++ totem-URI-scheme-handler-support.patch ++++++
From 74833ef98e515104a5ef10b0e59af0b5a0244ed7 Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess@hadess.net> Date: Tue, 05 Oct 2010 10:06:41 +0000 Subject: Add support for URI scheme handlers
--- diff --git a/data/desktop.sh b/data/desktop.sh index 4c47664..2bb4693 100755 --- a/data/desktop.sh +++ b/data/desktop.sh @@ -10,4 +10,11 @@ for i in $MIMETYPES ; do echo_mime; done +# URI scheme handlers +SCHEMES="pnm mms net rtp rtsp mmsh uvox icy icyx" + +for i in $SCHEMES ; do + printf "x-scheme-handler/$i"; +done + echo "" diff --git a/data/mime-functions.sh b/data/mime-functions.sh index 0ea9c40..370f35b 100644 --- a/data/mime-functions.sh +++ b/data/mime-functions.sh @@ -2,13 +2,13 @@ get_audio_mimetypes () { - MIMETYPES=`grep -v '^#' $1 | grep "\/" | grep audio | grep -v "audio/x-pn-realaudio" | grep -v "audio/x-scpls" | grep -v "audio/mpegurl" | grep -v "audio/x-mpegurl"` + MIMETYPES=`grep -v '^#' $1 | grep "\/" | grep audio | grep -v "audio/x-pn-realaudio" | grep -v "audio/x-scpls" | grep -v "audio/mpegurl" | grep -v "audio/x-mpegurl" | grep -v x-scheme-handler/` MIMETYPES="$MIMETYPES application/x-flac" } get_video_mimetypes () { - MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep -v "application/x-flac" | grep -v "text/google-video-pointer" | grep -v "application/x-quicktime-media-link" | grep -v "application/smil" | grep -v "application/smil+xml" | grep -v "application/x-smil" | grep -v "application/xspf+xml"` + MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep -v "application/x-flac" | grep -v "text/google-video-pointer" | grep -v "application/x-quicktime-media-link" | grep -v "application/smil" | grep -v "application/smil+xml" | grep -v "application/x-smil" | grep -v "application/xspf+xml" | grep -v x-scheme-handler/` MIMETYPES="$MIMETYPES audio/x-pn-realaudio" } diff --git a/data/mime-type-include.sh b/data/mime-type-include.sh index 9c269b1..3560839 100755 --- a/data/mime-type-include.sh +++ b/data/mime-type-include.sh @@ -22,7 +22,7 @@ if [ x"$1" = "x--nautilus" ] ; then exit 0 fi -MIMETYPES=`grep -v '^#' $1 | grep -v x-content/` +MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v x-scheme-handler/` echo "/* generated with mime-types-include.sh, don't edit */" echo "const char *mime_types[] = {" -- cgit v0.8.3.1 ++++++ totem-fix-scheme-handler.patch ++++++
From b337849b174efd6b11304ddcdd3cfda015ffef5b Mon Sep 17 00:00:00 2001 From: Bastien Nocera <hadess@hadess.net> Date: Fri, 08 Oct 2010 10:34:32 +0000 Subject: Fix x-scheme-handler/ printing
Missing a little ";" --- diff --git a/data/desktop.sh b/data/desktop.sh index 2bb4693..e168c8f 100755 --- a/data/desktop.sh +++ b/data/desktop.sh @@ -14,7 +14,7 @@ done SCHEMES="pnm mms net rtp rtsp mmsh uvox icy icyx" for i in $SCHEMES ; do - printf "x-scheme-handler/$i"; + printf "x-scheme-handler/$i;" done echo "" -- cgit v0.8.3.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de