From 45e92a9f7c1ec96cb027878d40ef0360034fcf41 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 31 May 2012 11:56:30 +1000 Subject: [PATCH] xkeyboard-config 2.6 - change source URL, 2.6 is in a different directory - force autoreconf, update to use intltoolize as autopoint --- .gitignore | 1 + olpc-azerty-fixes.patch | 53 ----------------------------------------- sources | 2 +- xkeyboard-config.spec | 17 ++++++------- 4 files changed, 11 insertions(+), 62 deletions(-) delete mode 100644 olpc-azerty-fixes.patch diff --git a/.gitignore b/.gitignore index 80560fc..bd20b4e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ xkeyboard-config-1.9.tar.bz2 /xkeyboard-config-2.4.1.tar.bz2 /xkeyboard-config-2.5.tar.bz2 /xkeyboard-config-2.5.1.tar.bz2 +/xkeyboard-config-2.6.tar.bz2 diff --git a/olpc-azerty-fixes.patch b/olpc-azerty-fixes.patch deleted file mode 100644 index 3c9c224..0000000 --- a/olpc-azerty-fixes.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5001e0b41a9ee22633b0a56571b2dc61bc55df4d Mon Sep 17 00:00:00 2001 -From: Daniel Drake -Date: Thu, 17 May 2012 20:21:00 +0000 -Subject: Update FR OLPC layout - -Some keys have only two characters printed: the unmodified character, -and a character in the Shift+AltGr position (upper right). -For such keys, users were confused why the "other" character could not -be accessed with AltGr alone. - -Make such keys behave shift-invariant to remove this confusion. - -Also add some obvious omissions from the previous submission fixing -various other keys that weren't working as printed. - -The corresponding keyboard can be seen here: -http://wiki.laptop.org/go/OLPC_Azerty_Keyboard - -Investigation and original patch from Walter Bender. - -https://bugs.freedesktop.org/show_bug.cgi?id=50064 ---- -diff --git a/symbols/fr b/symbols/fr -index 85bcd55..45ef6a4 100644 ---- a/symbols/fr -+++ b/symbols/fr -@@ -48,13 +48,17 @@ xkb_symbols "olpc" { - - name[Group1]="French"; - -- key { [ z, Z, VoidSymbol, guillemotleft ] }; -- -- key { [ s, S, VoidSymbol, ssharp ] }; -- -- key { [ x, X, VoidSymbol, guillemotright ] }; -- -- key { [ less, greater ] }; -+ key { [ less, greater ] }; -+ key { [ dead_circumflex, dead_diaeresis, notsign, dead_abovering ] }; -+ key { [ semicolon, period, underscore, multiply ] }; -+ key { [ twosuperior, asciitilde, VoidSymbol, VoidSymbol ] }; -+ -+ // Some keys only have the Shift+AltGr character printed on them (alongside -+ // the unmodified one). Make such keys shift-invariant so that the printed -+ // value is achieved by pressing AltGr or Shift+AltGr. -+ key { [ x, X, guillemotright, guillemotright ] }; -+ key { [ s, S, ssharp, ssharp ] }; -+ key { [ z, Z, guillemotleft, guillemotleft ] }; - }; - - partial alphanumeric_keys --- -cgit v0.9.0.2-2-gbebe diff --git a/sources b/sources index 69baa9f..d3d91fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29cbf3980bbe94c3ffc9c233ea638059 xkeyboard-config-2.5.1.tar.bz2 +e7e31da9adb56ba52b5c18226b8cbef3 xkeyboard-config-2.6.tar.bz2 diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 6fbc9a1..947b03d 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -6,8 +6,8 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 2.5.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Version: 2.6 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -16,10 +16,8 @@ Source0: %{name}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh Source2: commitid %else -Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2 %endif -# https://bugs.freedesktop.org/show_bug.cgi?id=50064 -Patch0: olpc-azerty-fixes.patch BuildArch: noarch @@ -71,11 +69,9 @@ git commit -a -q -m "%{name} %{version} baseline." %endif #git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) -%patch0 -p1 -b .azerty %build -intltoolize -autoreconf -v --install || exit 1 +AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1 %configure \ --enable-compat-rules \ --with-xkb-base=%{_datadir}/X11/xkb \ @@ -113,6 +109,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog +* Thu May 31 2012 Peter Hutterer 2.6-1 +- xkeyboard-config 2.6 +- change source URL, 2.6 is in a different directory +- force autoreconf, update to use intltoolize as autopoint + * Wed May 23 2012 Peter Robinson - 2.5.1-2 - Add upstream patch to fix OLPC azerty keyboard