- upgrade to latest cvs to handle xml comments (bug 178163)

.cvsignore

@@ -1,4 +1 @@
-libxklavier-1.02.tar.gz
-libxklavier-1.14.tar.gz
-libxklavier-2.0.tar.gz
-libxklavier-2.1.tar.gz
+libxklavier-2.1.0.2006.02.23.tar.bz2

libxklavier.spec

@@ -1,7 +1,7 @@
 Summary:	library providing high-level API for X Keyboard Extension
 Name:		libxklavier
-Version:	2.1
-Release:	3.2
+Version:	2.1.0.2006.02.23
+Release:	1
 License:	LGPL
 Group:		Development/Libraries
 Url: http://gswitchit.sourceforge.net/
@@ -9,12 +9,10 @@ BuildRequires: doxygen
 BuildRequires: libxml2-devel
 BuildRequires: libxkbfile-devel
 BuildRequires: libX11-devel
-Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
+Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Patch0: libxklavier-1.14-werror.patch
-Patch1: libxklavier-2.1-xkb-path.patch
-Patch2: libxklavier-2.1-xkb-path-autogen.patch
 
 %description
 libxklavier is a library providing high-level API for X Keyboard Extension
@@ -33,17 +31,16 @@ Libraries, include files, etc you can use to develop libxklavier applications.
 %prep
 %setup -q
 %patch0 -p1 -b .werror
-%patch1 -p0 -b .xkb-path
-%patch2 -p0 -b .xkb-path-autogen
+
 %build
 
-%configure --enable-doxygen --with-xkb-base='%{_datadir}/X11/xkb' --with-xkb-bin-base='%{_bindir}'
+%configure --disable-doxygen --with-xkb-base='%{_datadir}/X11/xkb' --with-xkb-bin-base='%{_bindir}'
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -64,13 +61,15 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-, root, root)
 
-%doc doc/html/*.html doc/html/*.png doc/html/*.css
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_includedir}/*
 
 %changelog
+* Thu Feb 23 2006 Ray Strode <rstrode@redhat.com> - 2.1-4
+- upgrade to latest cvs to handle xml comments (bug 178163)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.1-3.2
 - bump again for double-long bug on ppc(64)
 

sources

@@ -1 +1 @@
-6a44ea49f958d7c9ad319edeea338798  libxklavier-2.1.tar.gz
+dd8d58e79c76339008597f58b7ff5b44  libxklavier-2.1.0.2006.02.23.tar.bz2