rpms/libxklavier/devel vnc-bug.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 libxklavier.spec, 1.39, 1.40 sources, 1.16, 1.17

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/libxklavier/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32168

Modified Files:
	.cvsignore libxklavier.spec sources 
Added Files:
	vnc-bug.patch 
Log Message:
3.7


vnc-bug.patch:

--- NEW FILE vnc-bug.patch ---
diff -up libxklavier-3.6/libxklavier/xklavier_util.c.vnc-bug libxklavier-3.6/libxklavier/xklavier_util.c
--- libxklavier-3.6/libxklavier/xklavier_util.c.vnc-bug	2008-03-01 16:42:49.000000000 -0500
+++ libxklavier-3.6/libxklavier/xklavier_util.c	2008-08-30 12:43:27.000000000 -0400
@@ -118,7 +118,10 @@ xkl_get_debug_window_title(XklEngine * e
 	static gchar sname[33];
 	gchar *name;
 	strcpy(sname, "NULL");
-	if (win != (Window) NULL) {
+
+	if (win == (Window *) PointerRoot) {
+		strcpy(sname, "ROOT");
+	} else if (win != (Window *) None) {
 		name = xkl_engine_get_window_title(engine, win);
 		if (name != NULL) {
 			snprintf(sname, sizeof(sname), "%.32s", name);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	1 May 2008 01:52:34 -0000	1.16
+++ .cvsignore	6 Sep 2008 02:11:01 -0000	1.17
@@ -1 +1 @@
-libxklavier-3.6.tar.bz2
+libxklavier-3.7.tar.bz2


Index: libxklavier.spec
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libxklavier.spec	27 Jun 2008 14:15:11 -0000	1.39
+++ libxklavier.spec	6 Sep 2008 02:11:01 -0000	1.40
@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	3.6
-Release: 	2%{?dist}
+Version:	3.7
+Release: 	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -12,11 +12,9 @@
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: iso-codes-devel
-Source: http://download.gnome.org/sources/libxklavier/3.6/libxklavier-3.6.tar.bz2
+Source: http://download.gnome.org/sources/libxklavier/3.7/libxklavier-3.7.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch0: libxklavier-2.1-vnc-bug.patch
-
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
 known as XKB. This library is intended to support XFree86 and other
@@ -36,7 +34,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .vnc-bug
 
 %build
 
@@ -72,6 +69,9 @@
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Fri Sep  5 2008 Matthias Clasen <mclasen at redhat.com> - 3.7-1
+- Update to 3.7
+
 * Fri Jun 27 2008 Ray Strode <rstrode at redhat.com> - 3.6-2
 - Apply upstream patch to fix libxklavier crash (bug 452966)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libxklavier/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	1 May 2008 01:52:34 -0000	1.16
+++ sources	6 Sep 2008 02:11:01 -0000	1.17
@@ -1 +1 @@
-eff30f70e4c082e2aa6a0fbecc15253b  libxklavier-3.6.tar.bz2
+ee167645becd11309d64c6ff3a1600ff  libxklavier-3.7.tar.bz2