rpms/gnome-settings-daemon/F-13 0001-Disable-font-plugin-by-default.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.141, 1.142 touchpad-disabled.svg, 1.1, NONE touchpad-enabled.svg, 1.1, NONE

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22589

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	0001-Disable-font-plugin-by-default.patch 
Removed Files:
	touchpad-disabled.svg touchpad-enabled.svg 
Log Message:
* Mon Mar 22 2010 Bastien Nocera <bnocera at redhat.com> 2.29.92-3
- Disable font plugin by default


0001-Disable-font-plugin-by-default.patch:
 gnome-settings-daemon.schemas.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Disable-font-plugin-by-default.patch ---
>From 83ac6c9a151e77dcccfc2582e5a0760f459504e4 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Mon, 22 Mar 2010 15:47:07 +0000
Subject: [PATCH] Disable font plugin by default

The cursor theme for new apps is already loaded by the XSettings
plugin, and the X core fonts are obsoleted by fontconfig. Handling
of new fonts is done in the xsettings plugin as well.

https://bugzilla.gnome.org/show_bug.cgi?id=613604
---
 data/gnome-settings-daemon.schemas.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/data/gnome-settings-daemon.schemas.in b/data/gnome-settings-daemon.schemas.in
index 16bb71f..139919b 100644
--- a/data/gnome-settings-daemon.schemas.in
+++ b/data/gnome-settings-daemon.schemas.in
@@ -76,7 +76,7 @@
       <applyto>/apps/gnome_settings_daemon/plugins/font/active</applyto>
       <owner>gnome-settings-daemon</owner>
       <type>bool</type>
-      <default>TRUE</default>
+      <default>FALSE</default>
       <locale name="C">
         <short>Enable font plugin</short>
         <long>Set to True to enable the plugin to manage font settings.</long>
-- 
1.7.0.1



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-13/gnome-settings-daemon.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- gnome-settings-daemon.spec	9 Mar 2010 15:44:20 -0000	1.141
+++ gnome-settings-daemon.spec	22 Mar 2010 16:11:37 -0000	1.142
@@ -1,16 +1,12 @@
 Name:		gnome-settings-daemon
 Version:	2.29.92
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
 License:	GPLv2+
 URL:		http://download.gnome.org/sources/%{name}
 Source0:	http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
-# https://bugzilla.gnome.org/show_bug.cgi?id=611348
-Source1:        touchpad-enabled.svg
-Source2:        touchpad-disabled.svg
-
 
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
@@ -35,6 +31,9 @@ BuildRequires:	gettext intltool
 BuildRequires:  fontconfig-devel
 BuildRequires:	libcanberra-devel
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=613604
+Patch0: 0001-Disable-font-plugin-by-default.patch
+
 # change font rendering
 Patch3: slight-hinting.patch
 
@@ -58,12 +57,10 @@ developing applications that use %{name}
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-font-plugin
 %patch3 -p1 -b .slight-hinting
 %patch4 -p1 -b .keyboard-icon
 
-cp %{SOURCE1} plugins/media-keys
-cp %{SOURCE2} plugins/media-keys
-
 %build
 # https://fedoraproject.org/wiki/Features/ChangeInImplicitDSOLinking
 export LIBS="-lX11 -lm"
@@ -177,6 +174,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Mar 22 2010 Bastien Nocera <bnocera at redhat.com> 2.29.92-3
+- Disable font plugin by default
+
+* Wed Mar 10 2010 Bastien Nocera <bnocera at redhat.com> 2.29.92-2
+- Remove unneeded icons, already upstream
+
 * Tue Mar 09 2010 Bastien Nocera <bnocera at redhat.com> 2.29.92-1
 - Update to 2.29.92
 


--- touchpad-disabled.svg DELETED ---


--- touchpad-enabled.svg DELETED ---