rpms/xorg-x11-xkb-utils/devel .cvsignore, 1.13, 1.14 sources, 1.11, 1.12 xorg-x11-xkb-utils.spec, 1.27, 1.28 xkbcomp-1.0.5-dont-overwrite.patch, 1.1, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2579

Modified Files:
	.cvsignore sources xorg-x11-xkb-utils.spec 
Removed Files:
	xkbcomp-1.0.5-dont-overwrite.patch 
Log Message:
* Thu Jul 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-3
- xkbcomp 1.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore	25 Aug 2008 06:19:05 -0000	1.13
+++ .cvsignore	8 Jul 2009 23:09:27 -0000	1.14
@@ -2,4 +2,4 @@ setxkbmap-1.0.4.tar.bz2
 xkbevd-1.0.2.tar.bz2
 xkbprint-1.0.1.tar.bz2
 xkbutils-1.0.1.tar.bz2
-xkbcomp-1.0.5.tar.bz2
+xkbcomp-1.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	25 Aug 2008 06:19:05 -0000	1.11
+++ sources	8 Jul 2009 23:09:27 -0000	1.12
@@ -2,4 +2,4 @@
 68f2a143716c23b566f8509d9498f516  xkbevd-1.0.2.tar.bz2
 b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
 84396a3dd75337caaae29d8fa5616fb1  xkbutils-1.0.1.tar.bz2
-6cc96c3e4ed5d9802fe717beac008f19  xkbcomp-1.0.5.tar.bz2
+362380be3b3bed56c9ce45622eafc2c9  xkbcomp-1.1.0.tar.bz2


Index: xorg-x11-xkb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xorg-x11-xkb-utils.spec	2 Jul 2009 20:51:14 -0000	1.27
+++ xorg-x11-xkb-utils.spec	8 Jul 2009 23:09:27 -0000	1.28
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
 Version: 7.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -10,13 +10,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # use the macro so the doc dir is changed automagically
 %define xkbutils_version 1.0.1
 Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.0.5.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.1.0.tar.bz2
 Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.0.2.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
 Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.0.4.tar.bz2
 
-Patch1: xkbcomp-1.0.5-dont-overwrite.patch
-
 BuildRequires: pkgconfig
 BuildRequires: libxkbfile-devel
 BuildRequires: libX11-devel
@@ -50,7 +48,6 @@ X.Org X11 xkb gadgets
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
-%patch1 -p0 -b .dont-overwrite
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP -Os"
@@ -92,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xkbprint.1*
 
 %changelog
+* Thu Jul 09 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.4-3
+- xkbcomp 1.1.0
+
 * Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-2
 - Fix missing %%defattr in -extras
 


--- xkbcomp-1.0.5-dont-overwrite.patch DELETED ---