SHA256
1
0
forked from pool/kbd

Accepting request 245734 from home:pgajdos

- drop kbd-1.12-chvt-userwait.patch [bnc#830805] (internal)
  (--userwait seems to not be used anywhere)

- remove testutf8 stub (2009: testutf8 will be soon removed completely, 
  it's kept only not to break /etc/profile currently)

OBS-URL: https://build.opensuse.org/request/show/245734
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=56
This commit is contained in:
Marcus Meissner 2014-08-22 12:45:03 +00:00 committed by Git OBS Bridge
parent ca2aebb8e7
commit f7c0848183
3 changed files with 12 additions and 17 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Aug 22 09:50:15 UTC 2014 - pgajdos@suse.com
- drop kbd-1.12-chvt-userwait.patch [bnc#830805] (internal)
(--userwait seems to not be used anywhere)
-------------------------------------------------------------------
Fri Aug 22 09:25:51 UTC 2014 - pgajdos@suse.com
- remove testutf8 stub (2009: testutf8 will be soon removed completely,
it's kept only not to break /etc/profile currently)
-------------------------------------------------------------------
Fri Aug 22 06:51:23 UTC 2014 - pgajdos@suse.com

View File

@ -36,7 +36,6 @@ Source5: kbd.fillup
Source6: kbd.fillup.nonpc
Source8: sysconfig.console
Source9: sysconfig.keyboard
Source10: testutf8
Source11: fbtest.c
Source12: fbtest.8
Source13: guess_encoding.pl
@ -49,7 +48,6 @@ Patch4: kbd-1.15.2-sv-latin1-keycode10.patch
Patch5: kbd-1.15.2-setfont-no-cruft.patch
# TODO: no ideas how to port it.
Patch6: kbd-1.15.2-dumpkeys-C-opt.patch
Patch8: kbd-1.15.2-chvt-userwait.patch
Patch9: kbd-2.0.2-comment-typo-qwerty.patch
BuildRequires: automake
@ -91,7 +89,6 @@ Authors:
%patch5 -p1
# TODO: no ideas how to port it.
# %%patch6
%patch8 -p1
%patch9
%build
@ -230,7 +227,6 @@ cat %{SOURCE6} >> $FILLUP_DIR/sysconfig.keyboard
rm -f %{buildroot}/%{_mandir}/man8/getkeycodes.8*
rm -f %{buildroot}/%{_mandir}/man8/setkeycodes.8*
%endif
install -m 755 %_sourcedir/testutf8 %{buildroot}/%{_bindir}
install -m 755 fbtest %{buildroot}/%{_sbindir}
install -m 644 %{SOURCE12} %{buildroot}/%{_mandir}/man8/
install -m 755 %{SOURCE13} %{buildroot}/%{_bindir}/guess_encoding
@ -268,7 +264,6 @@ ln -s %{_bindir}/showconsolefont %{buildroot}/bin
ln -s %{_bindir}/showkey %{buildroot}/bin
ln -s %{_bindir}/spawn_console %{buildroot}/bin
ln -s %{_bindir}/spawn_login %{buildroot}/bin
ln -s %{_bindir}/testutf8 %{buildroot}/bin
ln -s %{_bindir}/unicode_start %{buildroot}/bin
ln -s %{_bindir}/unicode_stop %{buildroot}/bin
ln -s %{_sbindir}/fbtest %{buildroot}/sbin
@ -335,7 +330,6 @@ ln -s %{_bindir}/resizecons %{buildroot}/bin
/bin/unicode_start
/bin/unicode_stop
/bin/kbdrate
/bin/testutf8
/bin/guess_encoding
/bin/clrunimap
/bin/getunimap
@ -381,7 +375,6 @@ ln -s %{_bindir}/resizecons %{buildroot}/bin
%{_bindir}/unicode_start
%{_bindir}/unicode_stop
%{_bindir}/kbdrate
%{_bindir}/testutf8
%{_bindir}/guess_encoding
%{_bindir}/clrunimap
%{_bindir}/getunimap

View File

@ -1,10 +0,0 @@
#!/bin/sh
# testutf8 will be soon removed completely, it's kept only not to break
# /etc/profile currently
if tty -s; then
exit 2
else
exit 0
fi