rpms/libxklavier/devel flags.patch, 1.1, 1.2 libxklavier.spec, 1.55, 1.56 xinput-fixes.patch, 1.1, NONE

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	flags.patch libxklavier.spec 
Removed Files:
	xinput-fixes.patch 
Log Message:
5.0


flags.patch:
 xkl_engine.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: flags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/devel/flags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- flags.patch	9 Jul 2009 18:48:53 -0000	1.1
+++ flags.patch	17 Jan 2010 03:20:30 -0000	1.2
@@ -1,12 +1,12 @@
-diff -up libxklavier-4.0/libxklavier/xkl_engine.h.flags libxklavier-4.0/libxklavier/xkl_engine.h
---- libxklavier-4.0/libxklavier/xkl_engine.h.flags	2009-07-09 14:44:22.219289759 -0400
-+++ libxklavier-4.0/libxklavier/xkl_engine.h	2009-07-09 14:44:32.981284927 -0400
+diff -up libxklavier-5.0/libxklavier/xkl_engine.h.flags libxklavier-5.0/libxklavier/xkl_engine.h
+--- libxklavier-5.0/libxklavier/xkl_engine.h.flags	2010-01-16 22:13:38.250606995 -0500
++++ libxklavier-5.0/libxklavier/xkl_engine.h	2010-01-16 22:13:49.852829286 -0500
 @@ -59,7 +59,7 @@ extern "C" {
   *                                   xkl_start_listen(engine,XKLL_MANAGE_LAYOUTS);
   *   @XKLF_DEVICE_DISCOVERY: Backend supports device discovery, can notify
   */
 -	typedef enum {
 +	typedef enum { /*< flags >*/
- 		XKLF_CAN_TOGGLE_INDICATORS = 0x01,
- 		XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 0x02,
- 		XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 0x04,
+ 		XKLF_CAN_TOGGLE_INDICATORS = 1 << 0,
+ 		XKLF_CAN_OUTPUT_CONFIG_AS_ASCII = 1 << 1,
+ 		XKLF_CAN_OUTPUT_CONFIG_AS_BINARY = 1 << 2,


Index: libxklavier.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxklavier/devel/libxklavier.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- libxklavier.spec	10 Dec 2009 05:59:27 -0000	1.55
+++ libxklavier.spec	17 Jan 2010 03:20:30 -0000	1.56
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	4.0
-Release: 	7%{?dist}
+Version:	5.0
+Release: 	1%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -12,11 +12,10 @@ BuildRequires: libXi-devel
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: iso-codes-devel
-Source: http://download.gnome.org/sources/libxklavier/4.0/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/libxklavier/5.0/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
-Patch1: xinput-fixes.patch
 Patch2: catch-more-xerrors.patch
 
 %description
@@ -40,7 +39,6 @@ needed to develop libxklavier applicatio
 %prep
 %setup -q
 %patch0 -p1 -b .flags
-%patch1 -p0 -b .xinput
 %patch2 -p1 -b .catch-more-xerrors
 
 %build
@@ -82,6 +80,9 @@ rm -rf %{buildroot}
 %{_datadir}/gtk-doc/html/libxklavier/
 
 %changelog
+* Sat Jan 16 2010 Matthias Clasen <mclasen at redhat.com> - 5.0-1
+- Update to 5.0
+
 * Thu Dec 10 2009 Matthias Clasen <mclasen at redhat.com> - 4.0-7
 - Catch more X errors
 


--- xinput-fixes.patch DELETED ---