From d26b99274d0122ba70496106b18dabbfda3ad872fe21941a7f0817f66ef39c2e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 20 Jul 2016 06:59:39 +0000 Subject: [PATCH] Accepting request 407901 from home:scarabeus_iv:branches:Base:System - Version update to 2.0.3: * Various small updates - Obsolete merged patch: * kbd-1.15.5-br-abnt2-slash-question.patch - Quickly run over with spec-cleaner - Remove arch check for alpha and other unused platforms - Drop kbd.fillup.nonpc as it should not be needed nowdays OBS-URL: https://build.opensuse.org/request/show/407901 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=86 --- kbd-1.15.5-br-abnt2-slash-question.patch | 9 -- kbd-2.0.2-repack.tar.bz2 | 3 - kbd-2.0.2.tar.xz | 3 - kbd-2.0.3-repack.tar.bz2 | 3 + kbd.changes | 11 ++ kbd.fillup | 2 +- kbd.fillup.nonpc | 29 ---- kbd.spec | 174 +++++++++-------------- 8 files changed, 82 insertions(+), 152 deletions(-) delete mode 100644 kbd-1.15.5-br-abnt2-slash-question.patch delete mode 100644 kbd-2.0.2-repack.tar.bz2 delete mode 100644 kbd-2.0.2.tar.xz create mode 100644 kbd-2.0.3-repack.tar.bz2 delete mode 100644 kbd.fillup.nonpc diff --git a/kbd-1.15.5-br-abnt2-slash-question.patch b/kbd-1.15.5-br-abnt2-slash-question.patch deleted file mode 100644 index ec988ab..0000000 --- a/kbd-1.15.5-br-abnt2-slash-question.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- kbd-1.15.5/data/keymaps/i386/qwerty/br-abnt2.map.orig 2012-12-01 19:41:38.000000000 -0200 -+++ kbd-1.15.5/data/keymaps/i386/qwerty/br-abnt2.map 2016-06-16 00:18:55.745193940 -0300 -@@ -88,3 +88,6 @@ - keycode 125 = Scroll_Backward - keycode 126 = Scroll_Forward - keycode 127 = Compose -+ -+ altgr keycode 16 = slash -+ altgr keycode 17 = question diff --git a/kbd-2.0.2-repack.tar.bz2 b/kbd-2.0.2-repack.tar.bz2 deleted file mode 100644 index fa94bc2..0000000 --- a/kbd-2.0.2-repack.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b2e924d07e18030d8f86cce9fc7baed40c54fb38429cb66418ef435570e4f56 -size 1446466 diff --git a/kbd-2.0.2.tar.xz b/kbd-2.0.2.tar.xz deleted file mode 100644 index 30ed895..0000000 --- a/kbd-2.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912 -size 1023980 diff --git a/kbd-2.0.3-repack.tar.bz2 b/kbd-2.0.3-repack.tar.bz2 new file mode 100644 index 0000000..b394a0f --- /dev/null +++ b/kbd-2.0.3-repack.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee4c4178a6a733009f9068f05f866db3f1bed12dbe908e078e3af82f50ba8bda +size 1525278 diff --git a/kbd.changes b/kbd.changes index 100491d..72674e9 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jul 12 12:52:31 UTC 2016 - tchvatal@suse.com + +- Version update to 2.0.3: + * Various small updates +- Obsolete merged patch: + * kbd-1.15.5-br-abnt2-slash-question.patch +- Quickly run over with spec-cleaner +- Remove arch check for alpha and other unused platforms +- Drop kbd.fillup.nonpc as it should not be needed nowdays + ------------------------------------------------------------------- Thu Jun 16 00:18:55 CET 2016 - marceloatie@gmail.com diff --git a/kbd.fillup b/kbd.fillup index e15427b..e4db3a8 100644 --- a/kbd.fillup +++ b/kbd.fillup @@ -3,7 +3,7 @@ # Compose tables are good for producing characters, which can not # be directly input from your keyboard, such as characters with # accents, currency signs, ... -# Please read /usr/share/doc/packages/kbd/README.SuSE for an +# Please read /usr/share/doc/packages/kbd/README.SUSE for an # explanation. # You may leave this variable empty (default compose table from kernel # or KEYTABLE will be used then -- most keyboard maps don't have a diff --git a/kbd.fillup.nonpc b/kbd.fillup.nonpc deleted file mode 100644 index f448dc5..0000000 --- a/kbd.fillup.nonpc +++ /dev/null @@ -1,29 +0,0 @@ -# -# Compose tables to be loaded. -# Compose tables are good for producing characters, which can not -# be directly input from your keyboard, such as characters with -# accents, currency signs, ... -# Please read /usr/share/doc/packages/kbd/README.SuSE for an -# explanation. -# You may leave this variable empty (default compose table from kernel -# or KEYTABLE will be used then -- most don't have one, though) -# More than one compose table can be given. For a selection of possible -# tables see /usr/share/kbd/keymaps/include/compose.* -# You can give more than one compose table, but only the last one will -# determine the compose combinations. -# The word "clear" has a special meaning: -# Your compose table will be cleared, before more compose symbols are -# added. -# The files compose.winkeys and shiftctrl may be used to map the -# key to the W*n menu key and Shift-Ctrl, respectively, -# on a PC keyboard. -# A typical setting for Latin1 users (with a PC keyboard) may be -# COMPOSETABLE="clear winkeys shiftctrl latin1.add" -# For latin2, this would be -# COMPOSETABLE="clear winkeys shiftctrl latin2" -# A typical setting for sb. with a character set, where a matching -# compose table is missing (but with a PC keyboard), would be -# COMPOSETABLE="winkeys shiftctrl" -# For non-PC keyboards, don't use winkeys and shiftctrl ... -# -COMPOSETABLE="clear latin1.add" diff --git a/kbd.spec b/kbd.spec index 629fb35..fb56440 100644 --- a/kbd.spec +++ b/kbd.spec @@ -17,23 +17,19 @@ Name: kbd -Version: 2.0.2 +Version: 2.0.3 Release: 0 Summary: Keyboard and Font Utilities License: GPL-2.0+ Group: System/Console # git: git://git.altlinux.org/people/legion/packages/kbd.git Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/ -%if 0 -Source: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz -%else +# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh Source: %{name}-%{version}-repack.tar.bz2 -%endif Source1: kbd_fonts.tar.bz2 Source2: suse-add.tar.bz2 Source3: README.SUSE Source5: kbd.fillup -Source6: kbd.fillup.nonpc Source8: sysconfig.console Source9: sysconfig.keyboard Source11: fbtest.c @@ -59,27 +55,22 @@ Patch12: kbd-2.0.2-fix-bashisms.patch # Patch13: adds xkb and legacy keymaps subdirs to loadkyes search path # (openSUSE FATE#318355, sle FATE#318426) Patch13: kbd-1.15.5-loadkeys-search-path.patch -Patch14: kbd-1.15.5-br-abnt2-slash-question.patch - BuildRequires: automake BuildRequires: bison BuildRequires: check-devel +BuildRequires: console-setup BuildRequires: flex BuildRequires: gcc >= 4.6 BuildRequires: pam-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: suse-module-tools -BuildRequires: xz - -BuildRequires: console-setup BuildRequires: xkeyboard-config - -Requires(pre): %fillup_prereq -Requires(post): coreutils -Requires(postun): coreutils +BuildRequires: xz # Temporarily require -legacy Requires: %{name}-legacy = %{version}-%{release} - +Requires(post): coreutils +Requires(postun): coreutils +Requires(pre): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -90,13 +81,6 @@ menu to allow you to choose between the different fonts. This package also includes fonts from the kbd_fonts.tar.gz package (by Paul Gortmaker) on Sunsite. - - -Authors: --------- - Andries Brouwer - Alexey Gladkov - %package legacy Summary: Legacy data for kbd package Group: System/Console @@ -106,9 +90,7 @@ BuildArch: noarch The %{name}-legacy package contains original keymaps for kbd package. Please note that %{name}-legacy is not helpful without kbd. - - -%define kbd /usr/share/kbd +%define kbd %{_datadir}/kbd %prep %setup -q -a 1 -a 2 -n kbd-%{version} @@ -126,7 +108,6 @@ cp -fp %{SOURCE45} . %patch11 %patch12 -p1 %patch13 -p1 -%patch14 -p1 %build for i in `find data/keymaps/mac -type f` ; do @@ -138,26 +119,27 @@ pushd data/keymaps/i386 test -f qwerty/se-latin1.map || cp qwerty/sv-latin1.map qwerty/se-latin1.map # bnc#435121 test -f olpc/es-olpc.map || mv olpc/es.map olpc/es-olpc.map - # Rename conflicting keymaps, as Fedora do - test -f dvorak/no.map || mv dvorak/no.map dvorak/no-dvorak.map - test -f fgGIod/trf.map || mv fgGIod/trf.map fgGIod/trf-fgGIod.map - test -f olpc/pt.map || mv olpc/pt.map olpc/pt-olpc.map - test -f qwerty/cz.map || mv qwerty/cz.map qwerty/cz-qwerty.map + # Rename conflicting keymaps, as Fedora do + test -f dvorak/no.map || mv dvorak/no.map dvorak/no-dvorak.map + test -f fgGIod/trf.map || mv fgGIod/trf.map fgGIod/trf-fgGIod.map + test -f olpc/pt.map || mv olpc/pt.map olpc/pt-olpc.map + test -f qwerty/cz.map || mv qwerty/cz.map qwerty/cz-qwerty.map popd %configure \ + --disable-silent-rules \ --datadir=%{kbd} \ --enable-nls \ - --localedir=/usr/share/locale \ + --localedir=%{_datadir}/locale \ --enable-optional-progs \ --disable-vlock -make CFLAGS="%{optflags}" +make %{?_smp_mflags} gcc %{optflags} -o fbtest $RPM_SOURCE_DIR/fbtest.c # fix lat2-16.psfu (bnc#340579) font=data/consolefonts/lat2a-16.psfu ./src/psfxtable -i $font -it data/unimaps/lat2u.uni \ -o t.psfu mv t.psfu $font -make +make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_sbindir} @@ -165,7 +147,7 @@ DOC=%{buildroot}%{_defaultdocdir}/kbd KBD=%{kbd} K=%{buildroot}$KBD mkdir -p $K/consolefonts -# First install the fonts from the vfont package +# First install the fonts from the vfont package # (allowing kbd to overwrite some of them) mkdir -p $DOC/fonts install -m 644 fonts/README $DOC/fonts/README.fonts @@ -182,7 +164,7 @@ install -m 644 data/consolefonts/README* $DOC/fonts/ mkdir -p $DOC/doc/ install -m 644 docs/doc/keysyms.h.info docs/doc/kbd.FAQ.txt docs/doc/kbd.FAQ*.html docs/doc/README* docs/doc/TODO $DOC/doc/ install -m 644 docs/doc/as400.kbd docs/doc/console.docs docs/doc/repeat/set_kbd_repeat-2 $DOC/doc/ -echo "See /usr/share/i18/charmaps for a description of char maps" >$DOC/doc/README.charmaps +echo "See %{_datadir}/i18/charmaps for a description of char maps" >$DOC/doc/README.charmaps install -m 644 COPYING ChangeLog CREDITS README $DOC/ install -m 644 %{SOURCE3} $DOC/ rm -f $K/consolefonts/README* $K/consolefonts/ERRORS.gz @@ -254,19 +236,11 @@ FILLUP_DIR=%{buildroot}%{_localstatedir}/adm/fillup-templates mkdir -p $FILLUP_DIR install -m 644 %{SOURCE8} $FILLUP_DIR/sysconfig.console install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard -%ifarch %ix86 alpha ia64 x86_64 cat %{SOURCE5} >> $FILLUP_DIR/sysconfig.keyboard -%else -cat %{SOURCE6} >> $FILLUP_DIR/sysconfig.keyboard -%endif -#mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -#touch $RPM_BUILD_ROOT/etc/sysconfig/console -%ifnarch %ix86 -%ifnarch x86_64 +%ifnarch %{ix86} x86_64 rm -f %{buildroot}/%{_mandir}/man8/resizecons.8* %endif -%endif -%ifarch %sparc m68k +%ifarch %{sparc} m68k rm -f %{buildroot}/%{_mandir}/man8/getkeycodes.8* rm -f %{buildroot}/%{_mandir}/man8/setkeycodes.8* %endif @@ -311,55 +285,52 @@ ln -s %{_bindir}/spawn_login %{buildroot}/bin ln -s %{_bindir}/unicode_start %{buildroot}/bin ln -s %{_bindir}/unicode_stop %{buildroot}/bin ln -s %{_sbindir}/fbtest %{buildroot}/sbin -%ifnarch %sparc m68k +%ifnarch %{sparc} m68k ln -s %{_bindir}/getkeycodes %{buildroot}/bin ln -s %{_bindir}/setkeycodes %{buildroot}/bin %endif -%ifarch %ix86 -ln -s %{_bindir}/resizecons %{buildroot}/bin -%endif -%ifarch x86_64 +%ifarch %{ix86} x86_64 ln -s %{_bindir}/resizecons %{buildroot}/bin %endif #EndUsrMerge # Move original keymaps to legacy directory -mkdir -p $RPM_BUILD_ROOT/%{kbd}/keymaps/legacy -mv $RPM_BUILD_ROOT/%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} $RPM_BUILD_ROOT/%{kbd}/keymaps/legacy +mkdir -p %{buildroot}/%{kbd}/keymaps/legacy +mv %{buildroot}/%{kbd}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} %{buildroot}/%{kbd}/keymaps/legacy # Convert X keyboard layouts to console keymaps -mkdir -p $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb -perl xml2lst.pl < /usr/share/X11/xkb/rules/base.xml > layouts-variants.lst +mkdir -p %{buildroot}/%{kbd}/keymaps/xkb +perl xml2lst.pl < %{_datadir}/X11/xkb/rules/base.xml > layouts-variants.lst while read line; do XKBLAYOUT=`echo "$line" | cut -d " " -f 1` echo "$XKBLAYOUT" >> layouts-list.lst XKBVARIANT=`echo "$line" | cut -d " " -f 2` - ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz + ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > %{buildroot}/%{kbd}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz done < layouts-variants.lst # Convert X keyboard layouts (plain, no variant) cat layouts-list.lst | sort -u >> layouts-list-uniq.lst while read line; do - ckbcomp "$line" | gzip > $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/"$line".map.gz + ckbcomp "$line" | gzip > %{buildroot}/%{kbd}/keymaps/xkb/"$line".map.gz done < layouts-list-uniq.lst # wipe converted layouts which cannot input ASCII (rh#1031848) -zgrep -L "U+0041" $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/* | xargs rm -f +zgrep -L "U+0041" %{buildroot}/%{kbd}/keymaps/xkb/* | xargs rm -f # Rename the converted default fi (kotoistus) layout (rh#1117891) -gunzip $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/fi.map.gz -mv $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/fi.map $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/fi-kotoistus.map -gzip $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/fi-kotoistus.map +gunzip %{buildroot}/%{kbd}/keymaps/xkb/fi.map.gz +mv %{buildroot}/%{kbd}/keymaps/xkb/fi.map %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map +gzip %{buildroot}/%{kbd}/keymaps/xkb/fi-kotoistus.map # Fix converted cz layout - add compose rules (rh#1181581) -gunzip $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/cz.map.gz -patch $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/cz.map < %{SOURCE15} -gzip $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb/cz.map +gunzip %{buildroot}/%{kbd}/keymaps/xkb/cz.map.gz +patch %{buildroot}/%{kbd}/keymaps/xkb/cz.map < %{SOURCE15} +gzip %{buildroot}/%{kbd}/keymaps/xkb/cz.map # Generate entries for systemd's /usr/share/systemd/kbd-model-map -mkdir -p $RPM_BUILD_ROOT/usr/share/systemd -sh ./genmap4systemd.sh $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb \ - > $RPM_BUILD_ROOT/usr/share/systemd/kbd-model-map.xkb-generated +mkdir -p %{buildroot}%{_datadir}/systemd +sh ./genmap4systemd.sh %{buildroot}/%{kbd}/keymaps/xkb \ + > %{buildroot}%{_datadir}/systemd/kbd-model-map.xkb-generated %find_lang %{name} @@ -367,9 +338,6 @@ sh ./genmap4systemd.sh $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb \ %{fillup_only -n console} %{fillup_only -n keyboard} %{?regenerate_initrd_post} -#echo "Please read the docu about the new COMPOSETABLE rc.config variable." -#echo "See /etc/sysconfig/console, /etc/sysconfig/keyboard" -#echo "and {_docdir}/kbd/README.SUSE." %postun %{?regenerate_initrd_post} @@ -392,7 +360,7 @@ sh ./genmap4systemd.sh $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb \ /bin/openvt /bin/deallocvt /bin/dumpkeys -%ifnarch %sparc m68k +%ifnarch %{sparc} m68k /bin/getkeycodes /bin/setkeycodes %endif @@ -406,10 +374,7 @@ sh ./genmap4systemd.sh $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb \ /bin/psfgettable /bin/psfstriptable /bin/psfxtable -%ifarch %ix86 -/bin/resizecons -%endif -%ifarch x86_64 +%ifarch %{ix86} x86_64 /bin/resizecons %endif /bin/setfont @@ -437,7 +402,7 @@ sh ./genmap4systemd.sh $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb \ %{_bindir}/openvt %{_bindir}/deallocvt %{_bindir}/dumpkeys -%ifnarch %sparc m68k +%ifnarch %{sparc} m68k %{_bindir}/getkeycodes %{_bindir}/setkeycodes %endif @@ -451,10 +416,7 @@ sh ./genmap4systemd.sh $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb \ %{_bindir}/psfgettable %{_bindir}/psfstriptable %{_bindir}/psfxtable -%ifarch %ix86 -%{_bindir}/resizecons -%endif -%ifarch x86_64 +%ifarch %{ix86} x86_64 %{_bindir}/resizecons %endif %{_bindir}/setfont @@ -477,35 +439,33 @@ sh ./genmap4systemd.sh $RPM_BUILD_ROOT/%{kbd}/keymaps/xkb \ %{_bindir}/setvesablank %{_bindir}/spawn_console %{_bindir}/spawn_login -%doc %{_mandir}/man1/* -%doc %{_mandir}/man5/keymaps.5.gz -%ifnarch %sparc m68k -%doc %{_mandir}/man8/getkeycodes.8.gz -%doc %{_mandir}/man8/setkeycodes.8.gz +%{_mandir}/man1/* +%{_mandir}/man5/keymaps.5%{ext_man} +%ifnarch %{sparc} m68k +%{_mandir}/man8/getkeycodes.8%{ext_man} +%{_mandir}/man8/setkeycodes.8%{ext_man} %endif -%doc %{_mandir}/man8/showconsolefont.8.gz -%doc %{_mandir}/man8/loadunimap.8.gz -%doc %{_mandir}/man8/mapscrn.8.gz -%ifarch %ix86 -%doc %{_mandir}/man8/resizecons.8.gz +%{_mandir}/man8/showconsolefont.8%{ext_man} +%{_mandir}/man8/loadunimap.8%{ext_man} +%{_mandir}/man8/mapscrn.8%{ext_man} +%ifarch %{ix86} x86_64 +%{_mandir}/man8/resizecons.8%{ext_man} %endif -%ifarch x86_64 -%doc %{_mandir}/man8/resizecons.8.gz -%endif -%doc %{_mandir}/man8/setfont.8.gz -%doc %{_mandir}/man8/fbtest.8.gz -%doc %{_mandir}/man8/kbdrate.8.gz -%doc %{_mandir}/man8/clrunimap.8.gz -%doc %{_mandir}/man8/getunimap.8.gz -%doc %{_mandir}/man8/mk_modmap.8.gz -%doc %{_mandir}/man8/setlogcons.8.gz -%doc %{_mandir}/man8/setvesablank.8.gz -%doc %{_mandir}/man8/setvtrgb.8.gz -%doc %{_mandir}/man8/vcstime.8.gz -%dir /usr/share/systemd -/usr/share/systemd/kbd-model-map.xkb-generated +%{_mandir}/man8/setfont.8%{ext_man} +%{_mandir}/man8/fbtest.8%{ext_man} +%{_mandir}/man8/kbdrate.8%{ext_man} +%{_mandir}/man8/clrunimap.8%{ext_man} +%{_mandir}/man8/getunimap.8%{ext_man} +%{_mandir}/man8/mk_modmap.8%{ext_man} +%{_mandir}/man8/setlogcons.8%{ext_man} +%{_mandir}/man8/setvesablank.8%{ext_man} +%{_mandir}/man8/setvtrgb.8%{ext_man} +%{_mandir}/man8/vcstime.8%{ext_man} +%dir %{_datadir}/systemd +%{_datadir}/systemd/kbd-model-map.xkb-generated %files legacy +%defattr(-,root,root) %{kbd}/keymaps/legacy %changelog