From c56316ab3994e6b1b42bc2597f300fd86e2e8ef1a172313b0f9ff44bccab3119 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 24 Oct 2011 19:34:50 +0000 Subject: [PATCH] Accepting request 89151 from home:vuntz:branches:GNOME:Factory Add patch from git OBS-URL: https://build.opensuse.org/request/show/89151 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gsettings-desktop-schemas?expand=0&rev=25 --- ...s-desktop-schemas-x-content-software.patch | 25 +++++++++++++++++++ gsettings-desktop-schemas.changes | 6 +++++ gsettings-desktop-schemas.spec | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 gsettings-desktop-schemas-x-content-software.patch diff --git a/gsettings-desktop-schemas-x-content-software.patch b/gsettings-desktop-schemas-x-content-software.patch new file mode 100644 index 0000000..8997984 --- /dev/null +++ b/gsettings-desktop-schemas-x-content-software.patch @@ -0,0 +1,25 @@ +commit 96bf58048800f1336aa8424c475f951702ce4858 +Author: Cosimo Cecchi +Date: Mon Oct 3 15:56:46 2011 -0400 + + media: change x-content/software to x-content/unix-software + + The Nautilus handler doesn't claim x-content/software at all now, and + we're really interested in autorunning UNIX software rather than Win32 + one anyway. + + https://bugzilla.gnome.org/show_bug.cgi?id=660803 + +diff --git a/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in b/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in +index a1bd398..1df7aea 100644 +--- a/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in ++++ b/schemas/org.gnome.desktop.media-handling.gschema.xml.in.in +@@ -16,7 +16,7 @@ + <_description>If set to true, then Nautilus will never prompt nor autorun/autostart programs when a medium is inserted. + + +- [ 'x-content/software' ] ++ [ 'x-content/unix-software' ] + <_summary>List of x-content/* types where the preferred application will be launched + <_description>List of x-content/* types for which the user have chosen to start an application in the preference capplet. The preferred application for the given type will be started on insertion on media matching these types. + diff --git a/gsettings-desktop-schemas.changes b/gsettings-desktop-schemas.changes index 7423e5b..295fa3f 100644 --- a/gsettings-desktop-schemas.changes +++ b/gsettings-desktop-schemas.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 24 11:44:38 UTC 2011 - vuntz@opensuse.org + +- Add gsettings-desktop-schemas-x-content-software.patch: fix + autostart for media containing software. + ------------------------------------------------------------------- Mon Sep 26 10:36:18 UTC 2011 - vuntz@opensuse.org diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index b1bb629..7d57f77 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -26,6 +26,8 @@ Summary: Shared GSettings Schemas for the Desktop Url: http://gnome.org/ Group: System/GUI/GNOME Source0: http://download.gnome.org/sources/gsettings-desktop-schemas/3.2/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM gsettings-desktop-schemas-x-content-software.patch vuntz@opensuse.org -- Fix autostart for media containing software +Patch0: gsettings-desktop-schemas-x-content-software.patch BuildRequires: glib2-devel BuildRequires: intltool %if 0%{?BUILD_FROM_VCS} @@ -57,6 +59,7 @@ This package contains development files. %lang_package %prep %setup -q +%patch0 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh