rpms/xkeyboard-config/devel .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 xkeyboard-config.spec, 1.40, 1.41

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17279

Modified Files:
	.cvsignore sources xkeyboard-config.spec 
Log Message:
* Wed Jan 06 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7-1
- xkeyboard-config 1.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 May 2009 04:59:12 -0000	1.10
+++ .cvsignore	6 Jan 2010 02:16:18 -0000	1.11
@@ -1 +1 @@
-xkeyboard-config-1.6.tar.bz2
+xkeyboard-config-1.7.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	29 May 2009 04:59:12 -0000	1.11
+++ sources	6 Jan 2010 02:16:18 -0000	1.12
@@ -1 +1 @@
-5ae575a9073af12cd71773e065b38b3a  xkeyboard-config-1.6.tar.bz2
+d351c0109fac166edcedad32d1b0e38e  xkeyboard-config-1.7.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xkeyboard-config.spec	17 Aug 2009 23:16:56 -0000	1.40
+++ xkeyboard-config.spec	6 Jan 2010 02:16:18 -0000	1.41
@@ -3,8 +3,8 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 1.6
-Release: 3%{?dist}
+Version: 1.7
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -12,10 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 
-# Both upstream
-Patch1: xkeyboard-config-1.6-caps-super.patch
-Patch2: xkeyboard-config-1.6-caps-hyper.patch
-
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -56,7 +52,7 @@ fi
 git add .
 git commit -a -q -m "%{version} baseline."
 
-git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
+#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
 
 %build
 %configure \
@@ -96,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Jan 06 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7-1
+- xkeyboard-config 1.7
+
 * Tue Aug 18 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6-3
 - xkeyboard-config-1.6-caps-super.patch: add caps:super option (#505187)
 - xkeyboard-config-1.6-caps-hyper.patch: add caps:hyper option (#505187)