From 6c8cc349e646846d6f7be370e942a603a19202189bfb2c9c5aab767cbd709fd8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 23 Nov 2011 11:22:16 +0000 Subject: [PATCH] Accepting request 93168 from home:dimstar:branches:GNOME:Factory Update to 3.3.2 OBS-URL: https://build.opensuse.org/request/show/93168 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gsettings-desktop-schemas?expand=0&rev=27 --- gsettings-desktop-schemas-3.2.0.tar.bz2 | 3 --- gsettings-desktop-schemas-3.3.2.tar.bz2 | 3 +++ ...s-desktop-schemas-x-content-software.patch | 25 ------------------- gsettings-desktop-schemas.changes | 9 +++++++ gsettings-desktop-schemas.spec | 12 ++++----- 5 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 gsettings-desktop-schemas-3.2.0.tar.bz2 create mode 100644 gsettings-desktop-schemas-3.3.2.tar.bz2 delete mode 100644 gsettings-desktop-schemas-x-content-software.patch diff --git a/gsettings-desktop-schemas-3.2.0.tar.bz2 b/gsettings-desktop-schemas-3.2.0.tar.bz2 deleted file mode 100644 index 5f173f1..0000000 --- a/gsettings-desktop-schemas-3.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a99260fddc4c9ae797c61d55d37e893b0c26261d86676a9f26b6b8ab5a99d3c -size 174320 diff --git a/gsettings-desktop-schemas-3.3.2.tar.bz2 b/gsettings-desktop-schemas-3.3.2.tar.bz2 new file mode 100644 index 0000000..e149997 --- /dev/null +++ b/gsettings-desktop-schemas-3.3.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5ab04c292e61c3cc094f0ac2c301d18461e18ca16b678daef076d94f73d3fb7 +size 185965 diff --git a/gsettings-desktop-schemas-x-content-software.patch b/gsettings-desktop-schemas-x-content-software.patch deleted file mode 100644 index 8997984..0000000 --- a/gsettings-desktop-schemas-x-content-software.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 295fa3f..9efde4c 100644 --- a/gsettings-desktop-schemas.changes +++ b/gsettings-desktop-schemas.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 22 21:53:25 UTC 2011 - dimstar@opensuse.org + +- Update to version 3.3.2: + + Add shared wm schemas + + Updated translations. +- Drop gsettings-desktop-schemas-x-content-software.patch: fixed + upstream. + ------------------------------------------------------------------- Mon Oct 24 11:44:38 UTC 2011 - vuntz@opensuse.org diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 7d57f77..6255590 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -19,16 +19,14 @@ Name: gsettings-desktop-schemas -Version: 3.2.0 +Version: 3.3.2 Release: 1 License: LGPLv2+ 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 +Source0: http://download.gnome.org/sources/gsettings-desktop-schemas/3.3/%{name}-%{version}.tar.bz2 +BuildRequires: glib2-devel >= 2.31.0 BuildRequires: intltool %if 0%{?BUILD_FROM_VCS} BuildRequires: gnome-common @@ -59,7 +57,6 @@ This package contains development files. %lang_package %prep %setup -q -%patch0 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh @@ -100,11 +97,14 @@ rm -rf %{buildroot} %{_datadir}/glib-2.0/schemas/org.gnome.desktop.sound.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.desktop.thumbnail-cache.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.desktop.thumbnailers.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.desktop.wm.keybindings.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.system.locale.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.system.proxy.gschema.xml %dir %{_datadir}/GConf %dir %{_datadir}/GConf/gsettings %{_datadir}/GConf/gsettings/gsettings-desktop-schemas.convert +%{_datadir}/GConf/gsettings/wm-schemas.convert %files devel %defattr(-,root,root)