From 75ce585de60e6d1a456995070db16731866b60c8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 7 Apr 2011 10:14:28 -0400 Subject: [PATCH] Drop some questionable conversions --- ...Remove-some-questionable-conversions.patch | 50 +++++++++++++++++++ gsettings-desktop-schemas.spec | 12 ++++- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 0001-Remove-some-questionable-conversions.patch diff --git a/0001-Remove-some-questionable-conversions.patch b/0001-Remove-some-questionable-conversions.patch new file mode 100644 index 0000000..7427fc7 --- /dev/null +++ b/0001-Remove-some-questionable-conversions.patch @@ -0,0 +1,50 @@ +From 2762c8a92ca3ac41b7054a4849d49dddc9058828 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Thu, 7 Apr 2011 10:06:24 -0400 +Subject: [PATCH] Remove some questionable conversions + +We can't convert picture-filename to picture-uri, since a filename +is not a uri, and then the other picture-related keys don't make sense +to migrate. And we really don't want to migrate show-desktop-icons +and draw-background. Or any of the GTK+ tweak keys. +--- + schemas/gsettings-desktop-schemas.convert | 19 ------------------- + 1 files changed, 0 insertions(+), 19 deletions(-) + +diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert +index 960e6b4..95e6c6d 100644 +--- a/schemas/gsettings-desktop-schemas.convert ++++ b/schemas/gsettings-desktop-schemas.convert +@@ -1,14 +1,3 @@ +-# From org.gnome.desktop.background.gschema.xml.in +-[org.gnome.desktop.background] +-draw-background = /desktop/gnome/background/draw_background +-picture-options = /desktop/gnome/background/picture_options +-picture-uri = /desktop/gnome/background/picture_filename +-picture-opacity = /desktop/gnome/background/picture_opacity +-primary-color = /desktop/gnome/background/primary_color +-secondary-color = /desktop/gnome/background/secondary_color +-color-shading-type = /desktop/gnome/background/color_shading_type +-show-desktop-icons = /apps/nautilus/preferences/show_desktop +- + # From org.gnome.desktop-media-handling.gschema.xml.in + [org.gnome.desktop.media-handling] + automount = /apps/nautilus/preferences/media_automount +@@ -35,14 +24,6 @@ exec-arg = /desktop/gnome/applications/terminal/exec_arg + [org.gnome.desktop.interface] + toolkit-accessibility = /desktop/gnome/interface/accessibility + enable-animations = /desktop/gnome/interface/enable_animations +-menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff +-can-change-accels = /desktop/gnome/interface/can_change_accels +-toolbar-style = /desktop/gnome/interface/toolbar_style +-menus-have-icons = /desktop/gnome/interface/menus_have_icons +-buttons-have-icons = /desktop/gnome/interface/buttons_have_icons +-menubar-detachable = /desktop/gnome/interface/menubar_detachable +-toolbar-detachable = /desktop/gnome/interface/toolbar_detachable +-toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size + # Disabled, as we want users to use the new default: + # https://bugzilla.gnome.org/show_bug.cgi?id=634639 + # cursor-blink = /desktop/gnome/interface/cursor_blink +-- +1.7.4.2 + diff --git a/gsettings-desktop-schemas.spec b/gsettings-desktop-schemas.spec index 1898901..da5a404 100644 --- a/gsettings-desktop-schemas.spec +++ b/gsettings-desktop-schemas.spec @@ -1,6 +1,6 @@ Name: gsettings-desktop-schemas Version: 3.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of GSettings schemas Group: System Environment/Libraries @@ -8,7 +8,11 @@ License: LGPLv2+ # no homepage exists for this component URL: http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas #VCS: git:git://git.gnome.org/gsettings-desktop-schemas -Source: http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 + +# https://bugzilla.gnome.org/show_bug.cgi?id=647039 +Patch0: 0001-Remove-some-questionable-conversions.patch + BuildArch: noarch BuildRequires: glib2-devel >= 2.25.11 @@ -32,6 +36,7 @@ and header files for developing applications that use %{name}. %prep %setup -q +%patch0 -p1 -b .cull-migrations %build %configure --disable-schemas-compile @@ -67,6 +72,9 @@ fi %changelog +* Thu Apr 7 2011 Matthias Clasen 3.0.0-2 +- Don't perform questionable migrations + * Mon Apr 04 2011 Bastien Nocera 3.0.0-1 - Update to 3.0.0