rpm/kbd
SHA256
1
0
Fork 0
forked from pool/kbd
Code Pull Requests Activity

Accepting request 958755 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/958755
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=111
This commit is contained in:
Dominique Leuenberger 2022-03-05 13:43:49 +00:00 committed by Git OBS Bridge
commit 8386e60938
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kbd.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Mar 1 18:29:13 UTC 2022 - Wolfgang Bauer <wbauer@tmo.at>
- [kbdsettings] try to run numlockbios from /usr/libexec/kbd/ first
as Tumbleweed moved to this location a while ago (boo#1179295)
-------------------------------------------------------------------
Mon Feb 21 10:31:41 UTC 2022 - Fabian Vogt <fvogt@suse.com>
- Fix build without %_distconfdir (see bsc#1195679)
-------------------------------------------------------------------
Tue Feb 1 07:39:15 UTC 2022 - Dirk Müller <dmueller@suse.com>

8
kbd.spec
View File

@ -278,9 +278,13 @@ install -m 755 fbtest %{buildroot}%{_sbindir}
install -d %{buildroot}%{_libexecdir}/%{name}
install -m 755 numlockbios %{buildroot}%{_libexecdir}/%{name}
%endif
%if %{defined _distconfdir}
rm -rf %{buildroot}%{_sysconfdir}/pam.d
install -d %{buildroot}%{_distconfdir}/pam.d
install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/vlock
%else
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
%endif
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
%if !0%{?usrmerged}
mkdir -p %{buildroot}/bin
@ -522,7 +526,11 @@ test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vl
%{_mandir}/man8/setvesablank.8%{ext_man}
%{_mandir}/man8/setvtrgb.8%{ext_man}
%{_mandir}/man8/vcstime.8%{ext_man}
%if %{defined _distconfdir}
%{_distconfdir}/pam.d/vlock
%else
%config(noreplace) %{_sysconfdir}/pam.d/vlock
%endif
%dir %{_datadir}/systemd
%{_prefix}/lib/systemd/system/kbdsettings.service
%{_datadir}/systemd/kbd-model-map.xkb-generated

4
kbdsettings
View File

@ -26,7 +26,11 @@ for i in NUM SCR CAPS; do
/usr/bin/setleds -D -$param < /dev/$tty
;;
bios)
if [ -x /usr/libexec/kbd/numlockbios ]; then
bios=$(/usr/libexec/kbd/numlockbios 2>/dev/null)
else
bios=$(/usr/lib/kbd/numlockbios 2>/dev/null)
fi
if [ $param = "num" ]; then
if [ "$bios" = "on" ]; then
touch /run/numlock-on