rpms/xkeyboard-config/devel .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 xkeyboard-config.spec, 1.37, 1.38 usinet.patch, 1.4, NONE xkeyboard-config-1.4-battery.patch, 1.2, NONE xkeyboard-config-1.4-jp-tilde.patch, 1.2, NONE xkeyboard-config-1.5-evdevkbds.patch, 1.1, NONE xkeyboard-config-1.5-suspend-hibernate.patch, 1.1, NONE xkeyboard-config-1.5-terminate.patch, 1.1, NONE

[Peter Hutterer]

Author: whot

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

Modified Files:
	.cvsignore sources xkeyboard-config.spec 
Removed Files:
	usinet.patch xkeyboard-config-1.4-battery.patch 
	xkeyboard-config-1.4-jp-tilde.patch 
	xkeyboard-config-1.5-evdevkbds.patch 
	xkeyboard-config-1.5-suspend-hibernate.patch 
	xkeyboard-config-1.5-terminate.patch 
Log Message:
* Fri May 29 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.6-1
- xkeyboard-config 1.6
- Dropping all patches, merged upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	28 Jan 2009 02:10:59 -0000	1.9
+++ .cvsignore	29 May 2009 04:59:12 -0000	1.10
@@ -1 +1 @@
-xkeyboard-config-1.5.tar.bz2
+xkeyboard-config-1.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	28 Jan 2009 02:10:59 -0000	1.10
+++ sources	29 May 2009 04:59:12 -0000	1.11
@@ -1 +1 @@
-43c74312d303863b1b929554fa9ed9b3  xkeyboard-config-1.5.tar.bz2
+5ae575a9073af12cd71773e065b38b3a  xkeyboard-config-1.6.tar.bz2


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xkeyboard-config.spec	9 Apr 2009 05:29:39 -0000	1.37
+++ xkeyboard-config.spec	29 May 2009 04:59:12 -0000	1.38
@@ -3,23 +3,14 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 1.5
-Release: 5%{?dist}
+Version: 1.6
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
-Patch2: usinet.patch
-# Sent to svu, partially committed as d0ff2e0d4ac, expect for 1.6
-Patch4: xkeyboard-config-1.4-battery.patch
-# Sent to svu
-Patch5: xkeyboard-config-1.4-jp-tilde.patch
-# Taken from upstream, remove with 1.6
-Patch6: xkeyboard-config-1.5-evdevkbds.patch
-Patch7: xkeyboard-config-1.5-suspend-hibernate.patch
-Patch8: xkeyboard-config-1.5-terminate.patch
 
 BuildArch: noarch
 
@@ -61,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 \
@@ -101,6 +92,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Fri May 29 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.6-1
+- xkeyboard-config 1.6
+- Dropping all patches, merged upstream.
+
 * Tue Apr 07 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.5-5
 - xkeyboard-config-1.5-terminate.patch: remove Terminate_Server from default
   pc symbols, add terminate:ctrl_alt_bksp.


--- usinet.patch DELETED ---


--- xkeyboard-config-1.4-battery.patch DELETED ---


--- xkeyboard-config-1.4-jp-tilde.patch DELETED ---


--- xkeyboard-config-1.5-evdevkbds.patch DELETED ---


--- xkeyboard-config-1.5-suspend-hibernate.patch DELETED ---


--- xkeyboard-config-1.5-terminate.patch DELETED ---