diff --git a/.gitignore b/.gitignore index bd20b4e..bab23d6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ xkeyboard-config-1.9.tar.bz2 /xkeyboard-config-2.5.tar.bz2 /xkeyboard-config-2.5.1.tar.bz2 /xkeyboard-config-2.6.tar.bz2 +/xkeyboard-config-2.7.tar.bz2 diff --git a/0001-Reverting-broken-fix-for-is-keyboard.patch b/0001-Reverting-broken-fix-for-is-keyboard.patch deleted file mode 100644 index ba7f257..0000000 --- a/0001-Reverting-broken-fix-for-is-keyboard.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cd657ccb4223f34feffd635c3299206f96a5e216 Mon Sep 17 00:00:00 2001 -From: "Sergey V. Udaltsov" -Date: Fri, 1 Jun 2012 22:20:01 +0100 -Subject: [PATCH] Reverting broken fix for is keyboard - -https://bugs.freedesktop.org/show_bug.cgi?id=43173 ---- - symbols/is | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/symbols/is b/symbols/is -index f8e0ce1..e5f5d82 100644 ---- a/symbols/is -+++ b/symbols/is -@@ -21,14 +21,14 @@ xkb_symbols "basic" { - key { [ minus, underscore, dead_cedilla, dead_ogonek ] }; - - key { [ eth, ETH, dead_diaeresis, dead_abovering ] }; -- key { [apostrophe, question, dead_tilde, dead_macron ] }; -+ key { [apostrophe, question, asciitilde, dead_macron ] }; - - key { [ ae, AE, asciicircum, dead_doubleacute ] }; - key { [dead_acute, dead_acute, dead_circumflex, dead_caron ] }; - key { [dead_abovering, dead_diaeresis, notsign, hyphen ] }; - - // = -- key { [ plus, asterisk, dead_grave, dead_breve ] }; -+ key { [ plus, asterisk, grave, dead_breve ] }; - - // = , is in file "pc": pc105 - key { [ thorn, THORN, dead_belowdot, dead_abovedot ] }; --- -1.7.10.2 - diff --git a/sources b/sources index d3d91fb..61ead48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7e31da9adb56ba52b5c18226b8cbef3 xkeyboard-config-2.6.tar.bz2 +6ad7b43062f123eacf8ff0eb3a4e0678 xkeyboard-config-2.7.tar.bz2 diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 8963125..4aa081a 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -6,8 +6,8 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 2.6 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Version: 2.7 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -19,9 +19,6 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2 %endif -# Bug 826220 - Tilda is now a dead key (for accented chars) -Patch01: 0001-Reverting-broken-fix-for-is-keyboard.patch - BuildArch: noarch BuildRequires: pkgconfig @@ -112,6 +109,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog +* Thu Sep 27 2012 Peter Hutterer 2.7-1 +- xkeyboard-config 2.7 + * Sun Jul 22 2012 Fedora Release Engineering - 2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild