diff --git a/.gitignore b/.gitignore index c4ef262..304d5bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xkeyboard-config-1.8.tar.bz2 +xkeyboard-config-1.9.tar.bz2 diff --git a/0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch b/0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch deleted file mode 100644 index 3bb1a80..0000000 --- a/0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 75435d0906fa6722155a445e694b5ff45f71608a Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 25 Feb 2010 10:10:14 +1000 -Subject: [PATCH] Add Euro and New Shekel sign to israeli layout. - -According to [1], the standard layout requires the shekel sign on AltGr + a, -although Windows has it on AltGr + 4. The latter is already in use for some -other character, so let's put it where the standard requires it to be. -Euro sign goes on AltGr + e. - -This requires the inclusion of level3(ralt_switch) to get the IsoLevel3. - -[1] http://en.wikipedia.org/wiki/Shekel_sign - -Fedora Bug https://bugzilla.redhat.com/show_bug.cgi?id=542879 - -Signed-off-by: Peter Hutterer ---- - symbols/il | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/symbols/il b/symbols/il -index 4a3055d..cc29b12 100644 ---- a/symbols/il -+++ b/symbols/il -@@ -16,7 +16,6 @@ xkb_symbols "basic" { - - key { [ slash, Q ] }; - key { [ apostrophe, W ] }; -- key { [ hebrew_qoph, E ] }; - key { [ hebrew_resh, R ] }; - key { [ hebrew_aleph,T ] }; - key { [ hebrew_tet, Y ] }; -@@ -25,7 +24,6 @@ xkb_symbols "basic" { - key { [ hebrew_finalmem, O ] }; - key { [ hebrew_pe, P ] }; - -- key { [ hebrew_shin, A ] }; - key { [ hebrew_dalet,S ] }; - key { [ hebrew_gimel,D ] }; - key { [ hebrew_kaph, F ] }; -@@ -52,6 +50,8 @@ xkb_symbols "basic" { - - key { [ semicolon, asciitilde,0x10005b0 ]}; // Sheva - key { [ period, question, 0x10005c3 ]}; // Sof Pasuq -+ key { [ hebrew_qoph, E, EuroSign ]}; -+ key { [ hebrew_shin, A, 0x10020AA ]}; - - // The following may get overriden by the iso9995-3(basic101) symbols. - // therefore they are included here. -@@ -77,6 +77,8 @@ xkb_symbols "basic" { - key { [ bracketleft, braceleft, 0x10005bd ]}; // Meteg - - key { [ backslash, bar, 0x10005bb ]}; // Qubuts -+ -+ include "level3(ralt_switch)" - }; - - --- -1.6.6.1 - diff --git a/0001-Remove-duplicate-BKSL-key-mappings-from-hin-wx-layou.patch b/0001-Remove-duplicate-BKSL-key-mappings-from-hin-wx-layou.patch deleted file mode 100644 index 489698b..0000000 --- a/0001-Remove-duplicate-BKSL-key-mappings-from-hin-wx-layou.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 22efbcb2224384b349621dab38ebd446804baa61 Mon Sep 17 00:00:00 2001 -From: Parag Nemade -Date: Mon, 8 Mar 2010 10:38:36 +0530 -Subject: [PATCH] Remove duplicate BKSL key mappings from hin-wx layout Signed-off-by: Parag Nemade - ---- - symbols/in | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/symbols/in b/symbols/in -index 67e0ba9..6c86b7c 100644 ---- a/symbols/in -+++ b/symbols/in -@@ -1318,7 +1318,6 @@ xkb_symbols "hin-wx" { - key { [ 0x1000932, 0x1000962, 0x1000933, 0x100090C] }; - key { [ semicolon, colon ] }; - key { [ quoteright, quotedbl ] }; -- key { [ backslash, bar ] }; - - key { [ 0x1000901, 0x100093C, 0x100093D, 0x1000950] }; - key { [ 0x1000926, 0x1000927 ] }; --- -1.6.6.1 - diff --git a/0001-symbols-de-remove-BKSP-from-neo-layout.patch b/0001-symbols-de-remove-BKSP-from-neo-layout.patch deleted file mode 100644 index 2b259b6..0000000 --- a/0001-symbols-de-remove-BKSP-from-neo-layout.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bd0e2bdba64173bbb82f85a3358dd85296ed86ee Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 15 Mar 2010 14:18:14 +1000 -Subject: [PATCH] symbols/de: remove BKSP from neo layout. - -All it does is assign backspace to it on all levels and we pick this up -through the pc symbols. - -Fedora Bug 521482 - -Signed-off-by: Peter Hutterer ---- - symbols/de | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/symbols/de b/symbols/de -index b23aaf6..02b7c45 100644 ---- a/symbols/de -+++ b/symbols/de -@@ -287,8 +287,6 @@ xkb_symbols "neo" { - key { [ minus, emdash, NoSymbol, U2011, minus, NoSymbol, hyphen ] }; - key { [ dead_grave, NoSymbol, dead_diaeresis, dead_dasia, U030F, NoSymbol, NoSymbol ] }; - -- key { [ BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace, BackSpace ] }; -- - // top row - // -------------------------------------------------------------- - // xvlcwkhgfqß --- -1.6.6.1 - diff --git a/sources b/sources index 5fbf3f6..b51959c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37ae41628cd2ce35d202d30b1820c8ba xkeyboard-config-1.8.tar.bz2 +1fe14114db8e4f121060663d1fa5e214 xkeyboard-config-1.9.tar.bz2 diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 9d3c9c2..9a05415 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -3,16 +3,12 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config -Version: 1.8 -Release: 6%{?dist} +Version: 1.9 +Release: 1%{?dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig -Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2 - -Patch02: 0001-Add-Euro-and-New-Shekel-sign-to-israeli-layout.patch -Patch03: 0001-symbols-de-remove-BKSP-from-neo-layout.patch -Patch04: 0001-Remove-duplicate-BKSL-key-mappings-from-hin-wx-layou.patch +Source0: ftp://ftp.x.org/pub/individual/data/%{name}/%{name}-%{version}.tar.bz2 BuildArch: noarch @@ -29,6 +25,15 @@ This package contains configuration data used by the X Keyboard Extension (XKB), which allows selection of keyboard layouts when using a graphical interface. +%package devel +Summary: Development files for %{name} +Group: User Interface/X +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +%{name} development package + %prep %setup -q -n %{name}-%{version} @@ -40,7 +45,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 \ @@ -74,7 +79,17 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/X11/xkb/rules/xorg.lst %{_datadir}/X11/xkb/rules/xorg.xml +%files devel +%defattr(-,root,root,-) +%{_datadir}/pkgconfig/xkeyboard-config.pc + %changelog +* Mon Aug 16 2010 Peter Hutterer 1.9-1 +- xkeyboard-config 1.9 +- update Source URL, hosted on x.org now. +- add -devel package for pkgconfig file added in 1.9. +- drop upstreamed patches. + * Tue Jul 20 2010 Peter Hutterer 1.8-6 - spec file cleanup. Patch by Parag An (#226562)