rpms/lxinput/devel lxinput-0.1.1-new-configfile.patch, NONE, 1.1 lxinput.spec, 1.5, 1.6

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxinput/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv595

Modified Files:
	lxinput.spec 
Added Files:
	lxinput-0.1.1-new-configfile.patch 
Log Message:
* Sun Jan 31 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-3
- Adjust config file after transition from lxde-settings-daemon to lxsession


lxinput-0.1.1-new-configfile.patch:
 lxinput.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE lxinput-0.1.1-new-configfile.patch ---
--- lxinput-0.1.1.orig/src/lxinput.c	2009-07-06 22:37:12.000000000 +0200
+++ lxinput-0.1.1/src/lxinput.c	2009-12-15 13:59:28.000000000 +0100
@@ -139,7 +139,7 @@
 static void load_settings()
 {
     /* load settings form LXDE config files */
-	file = g_build_filename( g_get_user_config_dir(), "lxde/config", NULL );
+	file = g_build_filename( g_get_user_config_dir(), "lxde/desktop.conf", NULL );
 	gboolean ret = g_key_file_load_from_file( kf, file, 0, NULL );
 
     if( ret )


Index: lxinput.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxinput/devel/lxinput.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- lxinput.spec	25 Jul 2009 11:30:35 -0000	1.5
+++ lxinput.spec	31 Jan 2010 01:59:36 -0000	1.6
@@ -2,18 +2,20 @@
 
 Name:           lxinput
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Keyboard and mouse settings dialog for LXDE
 
 Group:          User Interface/Desktops
 License:        GPLv2+
-URL:            http://lxde.sourceforge.net/
+URL:            http://lxde.org/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
+# http://lxde.svn.sourceforge.net/viewvc/lxde/trunk/lxinput/src/lxinput.c?r1=1748&r2=2266
+Patch0:         lxinput-0.1.1-new-configfile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
 BuildRequires:  gettext intltool desktop-file-utils
-Requires:       lxde-settings-daemon
+Requires:       lxsession >= 0.4.0
 
 %description
 LXInput is a keyboard and mouse configuration utility for LXDE, the 
@@ -21,6 +23,7 @@ Lightweight X11 Desktop Environment.
 
 %prep
 %setup -q
+%patch0 -p1 -b .new
 
 
 %build
@@ -55,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jan 31 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-3
+- Adjust config file after transition from lxde-settings-daemon to lxsession
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild