diff --git a/.gitignore b/.gitignore index bab23d6..cae5016 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ xkeyboard-config-1.9.tar.bz2 /xkeyboard-config-2.5.1.tar.bz2 /xkeyboard-config-2.6.tar.bz2 /xkeyboard-config-2.7.tar.bz2 +/xkeyboard-config-2.8.tar.bz2 diff --git a/0001-rules-remove-ml-in-mal-mapping.patch b/0001-rules-remove-ml-in-mal-mapping.patch deleted file mode 100644 index 929b065..0000000 --- a/0001-rules-remove-ml-in-mal-mapping.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 05bed913327ffd5ad1e830699a238bca226ee31c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 2 Jan 2013 10:50:57 +1000 -Subject: [PATCH] =?UTF-8?q?rules:=20remove=20ml=20=E2=86=92=20in(mal)=20ma?= - =?UTF-8?q?pping?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -ml is Mali, the country. -in(mal) is Malayalam, the language - -Likely introduced in 0a5705d83d3f27892543e809b078644a2dba3911, but went -unnoticed so far. - -https://bugzilla.redhat.com/show_bug.cgi?id=647433 - -Signed-off-by: Peter Hutterer ---- - rules/compat/layoutsMapping.lst | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/rules/compat/layoutsMapping.lst b/rules/compat/layoutsMapping.lst -index cecda6d..a1a0218 100644 ---- a/rules/compat/layoutsMapping.lst -+++ b/rules/compat/layoutsMapping.lst -@@ -14,7 +14,6 @@ iu ca(ike) - lo la - kan in(kan) - mi mao --ml in(mal) - ogham ie(ogam) - ori ie(ori) - sapmi no(smi) --- -1.8.0.2 - diff --git a/sources b/sources index 61ead48..5aff1c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ad7b43062f123eacf8ff0eb3a4e0678 xkeyboard-config-2.7.tar.bz2 +e66d567d85a954d589c5723fb0e1f3dd xkeyboard-config-2.8.tar.bz2 diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index c87cf76..d6fc4be 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -6,8 +6,8 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 2.7 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 2.8 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -19,8 +19,6 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2 %endif -Patch01: 0001-rules-remove-ml-in-mal-mapping.patch - BuildArch: noarch BuildRequires: pkgconfig @@ -111,6 +109,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog +* Thu Jan 31 2013 Peter Hutterer 2.8-1 +- xkeyboard-config 2.8 + * Wed Jan 02 2013 Peter Hutterer 2.7-4 - Fix Mali layout previously mapped to in(mal) (#647433)