rpms/gnome-settings-daemon/devel .cvsignore, 1.10, 1.11 gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch, 1.1, 1.2 gnome-settings-daemon.spec, 1.29, 1.30 sources, 1.10, 1.11 gdm-keyboard-layout.patch, 1.1, NONE gnome-settings-daemon-2.22.1-hide-white-screen.patch, 1.1, NONE gnome-settings-daemon-background-without-nautilus.patch, 1.2, NONE gsd-handle-different-keysyms.patch, 1.1, NONE

William Jon McCann (mccann) fedora-extras-commits at redhat.com
Wed May 14 23:36:49 UTC 2008 

Author: mccann

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25921

Modified Files:
	.cvsignore 
	gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch 
	gnome-settings-daemon.spec sources 
Removed Files:
	gdm-keyboard-layout.patch 
	gnome-settings-daemon-2.22.1-hide-white-screen.patch 
	gnome-settings-daemon-background-without-nautilus.patch 
	gsd-handle-different-keysyms.patch 
Log Message:
- Build snapshot




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Apr 2008 19:56:45 -0000	1.10
+++ .cvsignore	14 May 2008 23:36:06 -0000	1.11
@@ -1 +1 @@
-gnome-settings-daemon-2.23.1.1.tar.bz2
+gnome-settings-daemon-2.23.2.tar.bz2

gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch:

Index: gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch	9 Mar 2008 23:48:54 -0000	1.1
+++ gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch	14 May 2008 23:36:06 -0000	1.2
@@ -1,17 +1,16 @@
-diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
-index a633167..7896d85 100644
---- a/plugins/keyboard/gsd-keyboard-xkb.c
-+++ b/plugins/keyboard/gsd-keyboard-xkb.c
-@@ -152,6 +152,12 @@ apply_xkb_settings (void)
+--- gnome-settings-daemon-2.23.2/plugins/keyboard/gsd-keyboard-xkb.c.ignore-layout-if-using-evdev	2008-05-14 00:42:44.000000000 -0400
++++ gnome-settings-daemon-2.23.2/plugins/keyboard/gsd-keyboard-xkb.c	2008-05-14 19:25:17.000000000 -0400
+@@ -181,6 +181,13 @@ apply_xkb_settings (void)
+                 gdm_keyboard_layout = NULL;
+         }
  
-         gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
-                                                   NULL);
 +        /* Ignore model if using evdev, since evdev needs its own model
 +         */
 +        if (strcmp (initial_sys_kbd_config.model, "evdev") == 0) {
 +                g_free (current_kbd_config.model);
 +                current_kbd_config.model = g_strdup ("evdev");
 +        }
++
          /* Activate - only if different! */
          if (!gkbd_keyboard_config_equals
              (&current_kbd_config, &current_sys_kbd_config)) {


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-settings-daemon.spec	13 May 2008 13:49:12 -0000	1.29
+++ gnome-settings-daemon.spec	14 May 2008 23:36:06 -0000	1.30
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.23.1.1
-Release:	5%{?dist}
+Version:	2.23.2
+Release:	0.2008.05.14.1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -17,7 +17,7 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	gtk2-devel
 BuildRequires:	gnome-vfs2-devel
-BuildRequires:	gnome-desktop-devel >= 2.22.0-6
+BuildRequires:	gnome-desktop-devel >= 2.23.2
 BuildRequires:	libglade2-devel
 BuildRequires:	libgnomeui-devel
 BuildRequires:	libgnome-devel
@@ -30,19 +30,8 @@
 
 Patch1:         add-randr-12.patch
 Patch2:         gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=438942
-# http://bugzilla.gnome.org/show_bug.cgi?id=524499
-Patch3:         gsd-mouse-too-much-grab.patch
-Patch4:         gnome-settings-daemon-2.22.1-hide-white-screen.patch
 # survive xrandr being absent (such as on Xnest in sabayon)
 Patch5:		xrandr-missingok.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=530356
-# https://bugzilla.redhat.com/show_bug.cgi?id=346201
-Patch6:         gsd-handle-different-keysyms.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=531487
-Patch7:		gnome-settings-daemon-background-without-nautilus.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=531589
-Patch8:		gdm-keyboard-layout.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -64,14 +53,7 @@
 
 %patch1 -p1 -b .add-randr-12
 %patch2 -p1 -b .ignore-layout-if-using-evdev
-pushd plugins/mouse/
-%patch3 -p0 -b .no-eat-keys
-popd
-%patch4 -p1 -b .hide-white-screen
 %patch5 -p1 -b .xrandr-missingok
-%patch6 -p1 -b .multi-keysyms
-%patch7 -p1 -b .background-without-nautilus
-%patch8 -p1 -b .gdm-keyboard-layout
 
 %build
 %configure --enable-static=no --enable-profiling
@@ -154,6 +136,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed May 14 2008 Jon McCann <jmccann at redhat.com> - 2.23.2-0.2008.05.14.1
+- Build snapshot
+
 * Tue May 13 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.1-1-5
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	25 Apr 2008 19:56:45 -0000	1.10
+++ sources	14 May 2008 23:36:06 -0000	1.11
@@ -1 +1 @@
-b5118a08f2c468400d98c3f58454b287  gnome-settings-daemon-2.23.1.1.tar.bz2
+4bf630843d1af8d470c6b884843fd352  gnome-settings-daemon-2.23.2.tar.bz2


--- gdm-keyboard-layout.patch DELETED ---


--- gnome-settings-daemon-2.22.1-hide-white-screen.patch DELETED ---


--- gnome-settings-daemon-background-without-nautilus.patch DELETED ---


--- gsd-handle-different-keysyms.patch DELETED ---

More information about the scm-commits mailing list