Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kbd for openSUSE:Factory checked in
at 2022-03-05 14:43:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kbd (Old)
and /work/SRC/openSUSE:Factory/.kbd.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kbd"
Sat Mar 5 14:43:49 2022 rev:111 rq:958755 version:2.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kbd/kbd.changes 2022-02-23 16:26:30.275508947
+0100
+++ /work/SRC/openSUSE:Factory/.kbd.new.1958/kbd.changes 2022-03-05
14:44:28.663716978 +0100
@@ -1,0 +2,11 @@
+Tue Mar 1 18:29:13 UTC 2022 - Wolfgang Bauer <wba...@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 <fv...@suse.com>
+
+- Fix build without %_distconfdir (see bsc#1195679)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kbd.spec ++++++
--- /var/tmp/diff_new_pack.vnnAxy/_old 2022-03-05 14:44:29.395717163 +0100
+++ /var/tmp/diff_new_pack.vnnAxy/_new 2022-03-05 14:44:29.399717164 +0100
@@ -278,9 +278,13 @@
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 @@
%{_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
++++++ kbdsettings ++++++
--- /var/tmp/diff_new_pack.vnnAxy/_old 2022-03-05 14:44:29.503717190 +0100
+++ /var/tmp/diff_new_pack.vnnAxy/_new 2022-03-05 14:44:29.503717190 +0100
@@ -26,7 +26,11 @@
/usr/bin/setleds -D -$param < /dev/$tty
;;
bios)
- bios=$(/usr/lib/kbd/numlockbios 2>/dev/null)
+ 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
