Update to 3.9.91

This commit is contained in:
Kalev Lember 2013-09-03 20:57:16 +02:00
parent c989439960
commit 417fd75368
3 changed files with 24 additions and 35 deletions

View File

@ -1,28 +0,0 @@
From e204eddcdbfb9f8d722355fab1643330c7d10c25 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 22 Aug 2013 16:23:01 -0400
Subject: [PATCH] Keep middle click paste enabled for now
We're not really ready for this change, and we haven't
messaged it properly. After discussion with Allan Day and
Jakup Steiner, we'll defer this change until the next cycle.
---
plugins/xsettings/gsd-xsettings-manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
index cb018a0..c0f21fc 100644
--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -348,7 +348,7 @@ static FixedEntry fixed_entries [] = {
{ "Gtk/ShowInputMethodMenu", fixed_false_int },
{ "Gtk/ShowUnicodeMenu", fixed_false_int },
{ "Gtk/AutoMnemonics", fixed_true_int },
- { "Gtk/EnablePrimaryPaste", fixed_false_int },
+ { "Gtk/EnablePrimaryPaste", fixed_true_int },
};
static TranslationEntry translations [] = {
--
1.8.3.1

View File

@ -1,8 +1,12 @@
%global gnome_desktop_version 3.9.0
%global libgweather_version 3.9.5
%global gsettings_desktop_schemas_version 3.9.91
%global geoclue_version 1.99.3
%global geocode_glib_version 0.99.3
Name: gnome-settings-daemon
Version: 3.9.90
Release: 2%{?dist}
Version: 3.9.91
Release: 1%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@ -12,8 +16,6 @@ URL: http://download.gnome.org/sources/%{name}
Source: http://download.gnome.org/sources/%{name}/3.9/%{name}-%{version}.tar.xz
# disable wacom for ppc/ppc64 (used on RHEL)
Patch0: %{name}-3.5.4-ppc-no-wacom.patch
# Backported from upstream
Patch1: 0001-Keep-middle-click-paste-enabled-for-now.patch
BuildRequires: dbus-glib-devel
BuildRequires: gtk3-devel >= 3.7.8
@ -24,15 +26,17 @@ BuildRequires: libgnomekbd-devel
BuildRequires: libnotify-devel
BuildRequires: gettext intltool
BuildRequires: fontconfig-devel
BuildRequires: geocode-glib-devel >= %{geocode_glib_version}
BuildRequires: libcanberra-devel
BuildRequires: polkit-devel
BuildRequires: autoconf automake libtool
BuildRequires: libxklavier-devel
BuildRequires: gsettings-desktop-schemas-devel >= 0.1.7
BuildRequires: gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
BuildRequires: PackageKit-glib-devel
BuildRequires: cups-devel
BuildRequires: upower-devel
BuildRequires: libgudev1-devel
BuildRequires: libgweather-devel >= %{libgweather_version}
BuildRequires: librsvg2-devel
BuildRequires: nss-devel
BuildRequires: colord-devel >= 0.1.12
@ -51,7 +55,11 @@ BuildRequires: xorg-x11-drv-wacom-devel
Requires: colord
Requires: control-center-filesystem
Requires: geoclue2 >= %{geoclue_version}
Requires: geocode-glib%{?_isa} >= %{geocode_glib_version}
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
Requires: libgweather%{?_isa} >= %{libgweather_version}
%description
A daemon to share settings from GNOME to other applications. It also
@ -80,7 +88,6 @@ The %{name}-updates package contains the updates plugin for %{name}
%if 0%{?rhel}
%patch0 -p1 -b .ppc-no-wacom
%endif
%patch1 -p1 -b .middle_click_paste
autoreconf -i -f
@ -133,6 +140,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_libdir}/gnome-settings-daemon-3.0/clipboard.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/libclipboard.so
%{_libdir}/gnome-settings-daemon-3.0/datetime.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/libdatetime.so
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.datetime.gschema.xml
%{_libdir}/gnome-settings-daemon-3.0/housekeeping.gnome-settings-plugin
%{_libdir}/gnome-settings-daemon-3.0/libhousekeeping.so
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml
@ -239,6 +250,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_libexecdir}/gsd-test-a11y-keyboard
%{_libexecdir}/gsd-test-a11y-settings
%{_libexecdir}/gsd-test-cursor
%{_libexecdir}/gsd-test-datetime
%{_libexecdir}/gsd-test-housekeeping
%{_libexecdir}/gsd-test-input-helper
%{_libexecdir}/gsd-test-keyboard
@ -251,6 +263,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_libexecdir}/gsd-test-screensaver-proxy
%{_libexecdir}/gsd-test-smartcard
%{_libexecdir}/gsd-test-sound
%{_libexecdir}/gsd-test-updates
%{_libexecdir}/gsd-test-xrandr
%{_libexecdir}/gsd-test-xsettings
@ -260,6 +273,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
%changelog
* Tue Sep 03 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.91-1
- Update to 3.9.91
- Include the new datetime plugin
* Fri Aug 23 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.90-2
- Keep middle click paste enabled for now

View File

@ -1 +1 @@
3bf54dd1c272ab956cb0a1c4d04ea25d gnome-settings-daemon-3.9.90.tar.xz
ad35d0f7ea757dea58cbf8f3efe7a006 gnome-settings-daemon-3.9.91.tar.xz