--- a/ChangeLog Sun Mar 22 04:07:38 2009 +0000
+++ b/ChangeLog Sun Mar 22 09:25:42 2009 +0000
@@ -1,3 +1,12 @@
+2009-03-22 Jerry Tan <[email protected]>
+
+ * SUNWgnome-media-player.spec
+ * base-specs/rhythmbox.spec
+ * base-specs/totem-pl-parser.spec
+ * patches/rhythmbox-01-playcd.diff
+ * patches/totem-pl-parser-01-ignore-cdda.diff
+ bump rhythmbox to 0.12.0
+
2009-03-22 Jerry Tan <[email protected]>
* SUNWdesktop-search.spec
--- a/SUNWgnome-media-player.spec Sun Mar 22 04:07:38 2009 +0000
+++ b/SUNWgnome-media-player.spec Sun Mar 22 09:25:42 2009 +0000
@@ -142,6 +142,44 @@
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+#rhythbmox use librasero-media library, add RBAC permission for it
+# RBAC related
+mkdir $RPM_BUILD_ROOT/etc/security
+# exec_attr(4)
+cat >> $RPM_BUILD_ROOT/etc/security/exec_attr <<EOF
+Desktop CD User:solaris:cmd:::/usr/bin/rhythmbox.bin:privs=sys_devices
+EOF
+#
+mv $RPM_BUILD_ROOT/usr/bin/rhythmbox $RPM_BUILD_ROOT/usr/bin/rhythmbox.bin
+cat >> $RPM_BUILD_ROOT/usr/bin/rhythmbox<< EOF
+#!/bin/sh
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+pfexec "\`dirname \$0\`/\`basename \$0\`.bin" "\$@"
+EOF
+
+
# We remove the below totem plugins including YouTube and Gromit
# since their respective dependecies gdata and gromit are missing
# on Solaris:
@@ -217,7 +255,7 @@
%files
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
+%attr (0755, root, bin)%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
%{_libdir}/nautilus/extensions-2.0/lib*.so*
@@ -304,6 +342,8 @@
%{_sysconfdir}/gconf/schemas/totem-handlers.schemas
%{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas
%{_sysconfdir}/gconf/schemas/totem.schemas
+%config %class (rbac) %attr (0644, root, sys) /etc/security/exec_attr
+
%files devel
%defattr (-, root, bin)
--- a/base-specs/rhythmbox.spec Sun Mar 22 04:07:38 2009 +0000
+++ b/base-specs/rhythmbox.spec Sun Mar 22 09:25:42 2009 +0000
@@ -10,23 +10,17 @@
Name: rhythmbox
License: GPL v2, MIT, BSD
Group: System/GUI/GNOME
-Version: 0.11.6
+Version: 0.12.0
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: Rhythmbox Multimedia Player
-Source: http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.11/%{name}-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.12/%{name}-%{version}.tar.bz2
%if %build_l10n
Source1: l10n-configure.sh
%endif
#owner:jerrytan date:2008-01-16 type:bug bugzilla:509846
Patch1: rhythmbox-01-playcd.diff
-#owner:jerrytan date:2008-08-04 type:bug bugzilla:546188
-Patch2: rhythmbox-02-missing-plugin.diff
-#owner:fujiwara date:2009-01-07 type:bug doo:5428 state:upstream
-Patch3: rhythmbox-03-po.diff
-#owner:jerrytan date:2009-03-16 type:bug bugzilla:574834
-Patch4: rhythmbox-04-addhalflag.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -53,9 +47,6 @@
%prep
%setup -q
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
%ifos linux
--- a/base-specs/totem-pl-parser.spec Sun Mar 22 04:07:38 2009 +0000
+++ b/base-specs/totem-pl-parser.spec Sun Mar 22 09:25:42 2009 +0000
@@ -18,6 +18,10 @@
Summary: Totem Multimedia Player
Source: http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.26/%{name}-%{version}.tar.bz2
+#owner:jerrytan date:2008-11-27 type:bug bugzilla:562425 bugster:6772165
+Patch1: totem-pl-parser-01-ignore-cdda.diff
+
+
%if %build_l10n
Source1: l10n-configure.sh
%endif
@@ -47,6 +51,7 @@
%prep
%setup -q
+%patch1 -p1
%build
%ifos linux
--- a/patches/rhythmbox-01-playcd.diff Sun Mar 22 04:07:38 2009 +0000
+++ b/patches/rhythmbox-01-playcd.diff Sun Mar 22 09:25:42 2009 +0000
@@ -11,15 +11,3 @@
g_object_set (G_OBJECT (priv->cdda), "device", priv->device_path, NULL);
priv->pipeline = gst_pipeline_new ("pipeline");
priv->fakesink = gst_element_factory_make ("fakesink", "fakesink");
---- rhythmbox-0.11.5/plugins/audiocd/sj-metadata.c.old Tue Apr 22 17:13:54 2008
-+++ rhythmbox-0.11.5/plugins/audiocd/sj-metadata.c Fri Apr 18 16:47:58 2008
-@@ -86,6 +86,9 @@
- SJ_METADATA_GET_CLASS (metadata)->set_cdrom (metadata, raw_path);
- g_free (raw_path);
- }
-+ else {
-+ SJ_METADATA_GET_CLASS (metadata)->set_cdrom (metadata, device);
-+ }
- #else
- SJ_METADATA_GET_CLASS (metadata)->set_cdrom (metadata, device);
- #endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/totem-pl-parser-01-ignore-cdda.diff Sun Mar 22 09:25:42 2009 +0000
@@ -0,0 +1,10 @@
+--- totem-pl-parser-2.26.0/plparse/totem-pl-parser.c.old 2009-03-22 16:21:17.866499000 +0800
++++ totem-pl-parser-2.26.0/plparse/totem-pl-parser.c 2009-03-22 16:23:05.474296000 +0800
+@@ -1448,6 +1448,7 @@
+
+ if (g_file_has_uri_scheme (file, "mms") != FALSE
+ || g_file_has_uri_scheme (file, "rtsp") != FALSE
++ || g_file_has_uri_scheme (file, "cdda") != FALSE
+ || g_file_has_uri_scheme (file, "rtmp") != FALSE
+ || g_file_has_uri_scheme (file, "icy") != FALSE
+ || g_file_has_uri_scheme (file, "pnm") != FALSE) {