diff --git a/xkeyboard-config-1.1.tar.bz2 b/xkeyboard-config-1.1.tar.bz2 deleted file mode 100644 index 620cebe..0000000 --- a/xkeyboard-config-1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fef905029f033859c7f8897f19dce6b7f10d107c51b8ad7c782214d7b2035ce6 -size 540972 diff --git a/xkeyboard-config-1.2.tar.bz2 b/xkeyboard-config-1.2.tar.bz2 new file mode 100644 index 0000000..dacd83d --- /dev/null +++ b/xkeyboard-config-1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64856896fb71708b6fc2bab146b387b2fb34da02ca9425a77dcfbfa59edb27f7 +size 586629 diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 50c05ea..5d6564d 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jan 30 11:11:13 CET 2008 - sndirsch@suse.de + +- xkeyboard-config 1.2 + * Some bugs are fixed (26), new layouts/models as usual. A lot of + code from OLPC is committed. + The important change is the new translation schema. Now, + base.xml does not contain all translations (which made it huge). + Instead, it contains only English strings. The .gmo files are + installed as a part of the installation process. It is up to + the applications/libs (libxklavier) to invoke gettext functions + at runtime - using the "xkeyboard-config" domain. + ------------------------------------------------------------------- Sat Sep 29 14:17:20 CEST 2007 - sndirsch@suse.de diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index f048624..4a3ec3b 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,7 +1,7 @@ # -# spec file for package xkeyboard-config (Version 1.1) +# spec file for package xkeyboard-config (Version 1.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,13 +13,13 @@ Name: xkeyboard-config BuildRequires: intltool perl-XML-Parser xorg-x11 Url: http://www.freedesktop.org/Software/XKeyboardConfig -License: GPL v2 or later; LGPL v2 or later; X11/MIT +License: GPL v2 or later; LGPL v2.1 or later; X11/MIT Group: System/X11/Utilities Requires: xorg-x11 Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on -Version: 1.1 +Version: 1.2 Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 @@ -60,9 +60,7 @@ Authors: %patch104 %build -intltoolize --force -autoreconf -fi -./configure --with-xkb-rules-symlink=xfree86,xorg \ +%configure --with-xkb-rules-symlink=xfree86,xorg \ --with-xkb-base=/usr/share/X11/xkb \ --enable-compat_rules \ --disable-xkbcomp-symlink @@ -73,23 +71,35 @@ make make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/var/lib/xkb ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkb/xkbcomp +%find_lang %name %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %name.lang %defattr(-,root,root) %doc AUTHORS COPYING README docs/HOWTO.* docs/README.* %dir /var/lib/xkb /usr/share/X11/xkb/ + %changelog -* Sat Sep 29 2007 - sndirsch@suse.de +* Wed Jan 30 2008 sndirsch@suse.de +- xkeyboard-config 1.2 + * Some bugs are fixed (26), new layouts/models as usual. A lot of + code from OLPC is committed. + The important change is the new translation schema. Now, + base.xml does not contain all translations (which made it huge). + Instead, it contains only English strings. The .gmo files are + installed as a part of the installation process. It is up to + the applications/libs (libxklavier) to invoke gettext functions + at runtime - using the "xkeyboard-config" domain. +* Sat Sep 29 2007 sndirsch@suse.de - xkeyboard-config 1.1 * some bug fixes (27) * new layouts/models -* Sat Aug 25 2007 - sndirsch@suse.de +* Sat Aug 25 2007 sndirsch@suse.de - reverted tp-menu.diff (wrong approach, Bug #302099) -* Thu Jul 12 2007 - sndirsch@suse.de +* Thu Jul 12 2007 sndirsch@suse.de - xkeyboard-config 1.0 * It is about 9 months since 0.9 - and here goes 1.0. There is nothing special big and special about that release, it is @@ -112,40 +122,40 @@ rm -rf $RPM_BUILD_ROOT * xkeyboard-config.inet.patch * xkeyboard-config.macintosh.patch * xkeyboard-config.mainline-cvs.mac-es.patch -* Tue May 22 2007 - sndirsch@suse.de +* Tue May 22 2007 sndirsch@suse.de - tp-menu.diff: * add mapping for Menu key on new Thinkpads like T60 (Bug #253397) -* Mon May 21 2007 - sndirsch@suse.de +* Mon May 21 2007 sndirsch@suse.de - xkeyboard-config.mainline-cvs.us-backslash.patch: * backslash needs to be explicitely set in us (Bug #275561) -* Sun May 13 2007 - sndirsch@suse.de +* Sun May 13 2007 sndirsch@suse.de - xkeyboard-config.mainline-cvs.il.patch: * fixed mapping for "|" symbol in hebrew layout (Bug #273712) -* Sat Apr 28 2007 - schwab@suse.de +* Sat Apr 28 2007 schwab@suse.de - Fix unknown keysym in inet(cymotionlinux). - Fix keycode for KP_Equal in inet(apple). -* Sun Apr 08 2007 - schwab@suse.de +* Sun Apr 08 2007 schwab@suse.de - Regenerate *.dir files. - Reduce build requirements. -* Sat Feb 03 2007 - sndirsch@suse.de +* Sat Feb 03 2007 sndirsch@suse.de - removed braindead cz-basic-bksl.diff again (Bugs #215359/#241824); use variant bksl/qwerty_bksl for cz keyboard layout instead -* Wed Nov 15 2006 - sndirsch@suse.de +* Wed Nov 15 2006 sndirsch@suse.de - xkeyboard-config.mainline-cvs.trans.patch: * updated Hungarian translations (Bug #8996) -* Fri Oct 27 2006 - olh@suse.de +* Fri Oct 27 2006 olh@suse.de - disable apple:badmap/apple:goodmap for Powerbooks with built-in USB ISO keyboard. The kernel delivers the correct keys now -* Fri Oct 27 2006 - sndirsch@suse.de +* Fri Oct 27 2006 sndirsch@suse.de - cz-basic-bksl.diff: * fixes backslash/bar on czech keyboard (Bug #215359) -* Tue Oct 17 2006 - olh@suse.de +* Tue Oct 17 2006 olh@suse.de - update mac/es, add euro to mac/us and mac/dk -* Tue Oct 17 2006 - olh@suse.de +* Tue Oct 17 2006 olh@suse.de - more fixes from cvs, restore previous macintosh behaviour -* Tue Oct 17 2006 - olh@suse.de +* Tue Oct 17 2006 olh@suse.de - fix symbols on macintosh -* Tue Oct 10 2006 - sndirsch@suse.de +* Tue Oct 10 2006 sndirsch@suse.de - updated to release 0.9: * Around 80 bugs from freedesktop.org bugzilla are fixed. * New layouts/models/translations are introduced. @@ -157,122 +167,122 @@ rm -rf $RPM_BUILD_ROOT - disabled p_macintosh-kb.diff since it no longer applies due to radical changes for Macintosh layout (see above); hopefully it's no longer required ... -* Tue Aug 01 2006 - sndirsch@suse.de +* Tue Aug 01 2006 sndirsch@suse.de - added xorg-x11 to Requires/BuildRequires to fix build - cleanup -* Fri Jul 28 2006 - sndirsch@suse.de +* Fri Jul 28 2006 sndirsch@suse.de - use "-fno-strict-aliasing" -* Thu Jul 27 2006 - sndirsch@suse.de +* Thu Jul 27 2006 sndirsch@suse.de - added support for inet keys on Acer C300 Laptop (dsieben) (fd.o Bug #7651) -* Tue Jul 25 2006 - sndirsch@suse.de +* Tue Jul 25 2006 sndirsch@suse.de - adjusted for X.Org 7 -* Sat Jun 24 2006 - sndirsch@suse.de +* Sat Jun 24 2006 sndirsch@suse.de - logitech.diff: * removed double entry for XF86AudioRaiseVolume (Bug #181118) -* Wed Jun 14 2006 - sndirsch@suse.de +* Wed Jun 14 2006 sndirsch@suse.de - use explicit hexadecimal values instead of XK_ISO_Level5 defines; makes changes in X.Org unnecessary (Bug #158951, X.Org Bug #4411) -* Sat Jun 10 2006 - sndirsch@suse.de +* Sat Jun 10 2006 sndirsch@suse.de - ISO_Level5.diff: * obsoletes ca_multi.diff (Bug #158951, X.Org Bug #4411) -* Fri Jun 09 2006 - sndirsch@suse.de +* Fri Jun 09 2006 sndirsch@suse.de - ca_multi.diff: * added support for "Canada - Multilingual" keyboard (Bug #158951) -* Sat Apr 15 2006 - sndirsch@suse.de +* Sat Apr 15 2006 sndirsch@suse.de - updated to release 0.8 * obsoletes khmer.diff, numlock-scrollLock.diff -* Sat Mar 25 2006 - sndirsch@suse.de +* Sat Mar 25 2006 sndirsch@suse.de - ralt.diff: * addresses RAlt problems (Bug #158177, Ubuntu #35845) -* Mon Mar 20 2006 - sndirsch@suse.de +* Mon Mar 20 2006 sndirsch@suse.de - xkeyboard-config_korean.diff: * korean keyboard layout (Bug #87443, freedesktop Bug #6323) -* Mon Feb 13 2006 - sndirsch@suse.de +* Mon Feb 13 2006 sndirsch@suse.de - added missing xorg rules symlinks (Bug #150245) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Sun Jan 22 2006 - sndirsch@suse.de +* Sun Jan 22 2006 sndirsch@suse.de - numlock-scrollLock.diff: * fix for Numlock/ScrollLock problem (X.Org Bug #5635) -* Mon Jan 16 2006 - sndirsch@suse.de +* Mon Jan 16 2006 sndirsch@suse.de - khmer.diff: * adds khmer keyboard support (Bug #143348) -* Wed Jan 04 2006 - sndirsch@suse.de +* Wed Jan 04 2006 sndirsch@suse.de - added xorg.lst compatibility symlink (required by xorgcfg) -* Fri Dec 23 2005 - sndirsch@suse.de +* Fri Dec 23 2005 sndirsch@suse.de - updated to new version 0.7 -* Mon Dec 05 2005 - sndirsch@suse.de +* Mon Dec 05 2005 sndirsch@suse.de - updated to current CVS release (2005-12-05) -* Thu Dec 01 2005 - sndirsch@suse.de +* Thu Dec 01 2005 sndirsch@suse.de - updated to current CVS release (2005-12-01) * obsoletes br-abnt2.diff * fixes Dell Inspiron 6000 layout for special keys (#135764) * obsoletes patches for symbols/macintosh_vndr/fr (X.Org #2870) -* Tue Sep 20 2005 - sndirsch@suse.de +* Tue Sep 20 2005 sndirsch@suse.de - br-abnt2.diff: * fixed brazilian "abnt2" keyboard layout (#116425) -* Tue Sep 06 2005 - sndirsch@suse.de +* Tue Sep 06 2005 sndirsch@suse.de - removed Prereq to xorg-x11 (#115369) -* Thu Aug 25 2005 - sndirsch@suse.de +* Thu Aug 25 2005 sndirsch@suse.de - updated to new version 0.6 * move Macedonian to country-based * translation updates -* Wed Aug 24 2005 - sndirsch@suse.de +* Wed Aug 24 2005 sndirsch@suse.de - updated to current CVS release (2005-08-24) * fr-latin9 compatibility rule added * added Thaana Keyboard Map * "Major Balkanian revolution" (Danilo Segan) * updated russian and turkish translations -* Sat Aug 20 2005 - sndirsch@suse.de +* Sat Aug 20 2005 sndirsch@suse.de - updated to current CVS release (2005-08-20) * updated Iranian layout to new standard (fd.o Bug #4102) * updated translations for tr -* Wed Aug 17 2005 - sndirsch@suse.de +* Wed Aug 17 2005 sndirsch@suse.de - ibm_space_saver.diff: * add support for "ibm_space_saver" keyboards (Bug #59788) -* Sun Aug 14 2005 - sndirsch@suse.de +* Sun Aug 14 2005 sndirsch@suse.de - updated to current CVS release (2005-08-14) * obsoletes print-screen.diff * buildfix for update-pot/update-po in po/Makefile.am -* Thu Aug 11 2005 - sndirsch@suse.de +* Thu Aug 11 2005 sndirsch@suse.de - print-screen.diff: * fixes GNOME print-screen functionality (Bug #103990) -* Wed Aug 10 2005 - sndirsch@suse.de +* Wed Aug 10 2005 sndirsch@suse.de - updated to current CVS release (2005-08-10) -* Tue Aug 02 2005 - schwab@suse.de +* Wed Aug 03 2005 schwab@suse.de - Fix reference to eject key in macintosh keymap. - Make noarch. -* Fri Jul 29 2005 - sndirsch@suse.de +* Fri Jul 29 2005 sndirsch@suse.de - xkeyboard-config-0.5.diff: * fixes typo: options --> option (Bug #98980) - enabled use of xkeyboard-config again -* Thu Jul 28 2005 - sndirsch@suse.de +* Fri Jul 29 2005 sndirsch@suse.de - make xkeyboard-config optional again; currently to big problems (Bug #98980) -* Tue Jul 26 2005 - sndirsch@suse.de +* Tue Jul 26 2005 sndirsch@suse.de - finally remove /etc/X11/xkb/symbols/pc directory of xorg-x11 package (%%pre) -* Thu Jul 14 2005 - sndirsch@suse.de +* Thu Jul 14 2005 sndirsch@suse.de - added /etc/X11/xkb/xkbcomp to package instead of creating/removing the symlink in %%post/%%preun -* Mon Jul 11 2005 - sndirsch@suse.de +* Mon Jul 11 2005 sndirsch@suse.de - add "Prereq: xorg-x11" to make sure that /etc/X11/xkb/symbols/pc/ directory will be removed before xkeyboard-config installs /etc/X11/xkb/symbols/pc file (Bug #95914). -* Wed Jul 06 2005 - sndirsch@suse.de +* Thu Jul 07 2005 sndirsch@suse.de - add symlink /usr/X11R6/lib/X11/xkb --> /etc/X11/xkb -* Wed Jul 06 2005 - sndirsch@suse.de +* Wed Jul 06 2005 sndirsch@suse.de - install package during update when xorg-x11/XFree86 package was already installed -* Wed Jul 06 2005 - sndirsch@suse.de +* Wed Jul 06 2005 sndirsch@suse.de - use /etc/X11/xkb for data files now; replaces the data files of xorg-x11 package -* Fri May 13 2005 - sndirsch@suse.de +* Fri May 13 2005 sndirsch@suse.de - use norootforbuild -* Sun Apr 17 2005 - sndirsch@suse.de +* Sun Apr 17 2005 sndirsch@suse.de - enabled compatibity rules (compatibility on 'XkbLayout' level) -* Sun Feb 06 2005 - sndirsch@suse.de +* Sun Feb 06 2005 sndirsch@suse.de - updated to release 0.5: * More bugs from freedesktop.org bugzilla fixed. The group names now are matching the descriptions - and the @@ -281,28 +291,28 @@ rm -rf $RPM_BUILD_ROOT Some translations are updated (though the overall translation activity is disappointinly low). * obsoletes p_xkb-cherryblueb.diff -* Sun Oct 24 2004 - sndirsch@suse.de +* Sun Oct 24 2004 sndirsch@suse.de - updated patches - removed obsolete patches -* Sun Oct 03 2004 - sndirsch@suse.de +* Sun Oct 03 2004 sndirsch@suse.de - updated to release 0.4: * A lot of fixes. More univeral EURO handling. New urdu layout. Improved handling for indicators. -* Wed Sep 29 2004 - sndirsch@suse.de +* Wed Sep 29 2004 sndirsch@suse.de - added missing prerequires ln,rm (Bug #46480) -* Sat Jul 24 2004 - sndirsch@suse.de +* Sat Jul 24 2004 sndirsch@suse.de - updated to release 0.3 * adjusted patches p_XFree86-4.3-kbdmapping.diff, p_xkb-cherryblueb.diff * adjusted filelist (.mo files no longer exist, added HOWTO.testing) -* Wed Jul 21 2004 - sndirsch@suse.de +* Wed Jul 21 2004 sndirsch@suse.de - added README.SuSE -* Sun Jun 13 2004 - sndirsch@suse.de +* Sun Jun 13 2004 sndirsch@suse.de - added required hunks of X.Org patches for xkb: * p_suse.diff * p_fixes.diff * p_xkb-cherryblueb.diff * p_XFree86-4.3-kbdmapping.diff * p_macintosh-kb.diff -* Sat Jun 12 2004 - sndirsch@suse.de +* Sat Jun 12 2004 sndirsch@suse.de - created package