rpms/gnome-settings-daemon/devel .cvsignore, 1.22, 1.23 gnome-settings-daemon-2.24.0-catch-deviceadded.patch, 1.1, 1.2 gnome-settings-daemon.spec, 1.93, 1.94 sources, 1.23, 1.24 gnome-settings-daemon-2.25.1-drop-sample-cache.patch, 1.1, NONE gnome-settings-daemon-2.25.2-fade.patch, 1.2, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20261

Modified Files:
	.cvsignore 
	gnome-settings-daemon-2.24.0-catch-deviceadded.patch 
	gnome-settings-daemon.spec sources 
Removed Files:
	gnome-settings-daemon-2.25.1-drop-sample-cache.patch 
	gnome-settings-daemon-2.25.2-fade.patch 
Log Message:
2.25.90



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	18 Dec 2008 18:00:04 -0000	1.22
+++ .cvsignore	5 Feb 2009 04:33:18 -0000	1.23
@@ -1 +1 @@
-gnome-settings-daemon-2.25.3.tar.bz2
+gnome-settings-daemon-2.25.90.tar.bz2

gnome-settings-daemon-2.24.0-catch-deviceadded.patch:

Index: gnome-settings-daemon-2.24.0-catch-deviceadded.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.24.0-catch-deviceadded.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-settings-daemon-2.24.0-catch-deviceadded.patch	10 Dec 2008 15:58:31 -0000	1.1
+++ gnome-settings-daemon-2.24.0-catch-deviceadded.patch	5 Feb 2009 04:33:18 -0000	1.2
@@ -1,14 +1,7 @@
-============================================================
- Listen for DeviceAdded in addition to DeviceEnabled
-
-  This should help address problems like left-handed
-mouse, and acceleration settings getting lost after
-resume, or when new devices gets plugged in.
-
-diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
---- a/plugins/mouse/gsd-mouse-manager.c
-+++ b/plugins/mouse/gsd-mouse-manager.c
-@@ -320,7 +320,7 @@ devicepresence_filter (GdkXEvent *xevent,
+diff -up gnome-settings-daemon-2.25.90/plugins/mouse/gsd-mouse-manager.c.catch-deviceadded gnome-settings-daemon-2.25.90/plugins/mouse/gsd-mouse-manager.c
+--- gnome-settings-daemon-2.25.90/plugins/mouse/gsd-mouse-manager.c.catch-deviceadded	2009-02-04 23:23:55.000000000 -0500
++++ gnome-settings-daemon-2.25.90/plugins/mouse/gsd-mouse-manager.c	2009-02-04 23:22:13.000000000 -0500
+@@ -320,7 +320,7 @@ devicepresence_filter (GdkXEvent *xevent
          if (xev->type == xi_presence)
          {
              XDevicePresenceNotifyEvent *dpn = (XDevicePresenceNotifyEvent *) xev;


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- gnome-settings-daemon.spec	20 Jan 2009 03:57:44 -0000	1.93
+++ gnome-settings-daemon.spec	5 Feb 2009 04:33:18 -0000	1.94
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
-Version:	2.25.3
-Release:	4%{?dist}
+Version:	2.25.90
+Release:	1%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -12,6 +12,7 @@
 Requires(pre): GConf2 >= 2.14
 Requires(preun): GConf2 >= 2.14
 Requires(post): GConf2 >= 2.14
+Requires: control-center-filesystem
 
 BuildRequires:	dbus-glib-devel
 BuildRequires:	GConf2-devel
@@ -28,16 +29,9 @@
 BuildRequires:	libgnomekbd-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	gettext
-BuildRequires:	perl(XML::Parser)
 BuildRequires:  autoconf, automake, libtool, intltool
 BuildRequires:  fontconfig-devel
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=545386
-Patch6:		gnome-settings-daemon-2.25.1-drop-sample-cache.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=552857
-Patch8:		gnome-settings-daemon-2.25.2-fade.patch
-
 # http://bugzilla.redhat.com/474758
 Patch10:	gnome-settings-daemon-2.24.0-catch-deviceadded.patch
 
@@ -62,18 +56,13 @@
 %prep
 %setup -q
 
-%patch6 -p1 -b .drop-sample-cache
-%patch8 -p1 -b .fade
 %patch10 -p1 -b .catch-deviceadded
 # This one is buggy, stop using for now
 #%patch11 -p1 -b .fix-touchpad
 
-%build
-aclocal
-automake
-libtoolize --force --copy
-autoconf
+autoreconf -i -f
 
+%build
 %configure --enable-static=no --enable-profiling --disable-esd
 make %{?_smp_mflags}
 
@@ -160,6 +149,7 @@
 %{_libdir}/gnome-settings-daemon-2.0
 %{_libexecdir}/gnome-settings-daemon
 %{_datadir}/gnome-settings-daemon/
+%{_datadir}/gnome-control-center/keybindings/50-accessibility.xml
 %{_datadir}/dbus-1/services/org.gnome.SettingsDaemon.service
 %{_sysconfdir}/xdg/autostart/gnome-settings-daemon.desktop
 %{_datadir}/icons/hicolor/*/apps/gsd-xrandr.*
@@ -170,6 +160,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Feb  4 2009 Matthias Clasen  <mclasen at redhat.com> - 2.25.90-1
+- Update to 2.25.90
+
 * Mon Jan 19 2009 - Ray Strode <rstrode at redhat.com> - 2.25.3-4
 - Update fade patch for new gnome-desktop release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	18 Dec 2008 18:00:04 -0000	1.23
+++ sources	5 Feb 2009 04:33:18 -0000	1.24
@@ -1 +1 @@
-b2fc1504df3d224562dc6625f5f7dc1b  gnome-settings-daemon-2.25.3.tar.bz2
+e50852ecd22ef956ac5ec5650683f2dd  gnome-settings-daemon-2.25.90.tar.bz2


--- gnome-settings-daemon-2.25.1-drop-sample-cache.patch DELETED ---


--- gnome-settings-daemon-2.25.2-fade.patch DELETED ---