Accepting request 754358 from home:kukuk:branches:Base:System
- Move pam.d/vlock to /usr/etc OBS-URL: https://build.opensuse.org/request/show/754358 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=117
This commit is contained in:
parent
0f7a852571
commit
1c042dbb46
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Dec 5 12:15:22 UTC 2019 - kukuk@suse.de
|
||||||
|
|
||||||
|
- Move pam.d/vlock to /usr/etc
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 19 09:05:55 UTC 2019 - Martin Vidner <mvidner@suse.com>
|
Thu Sep 19 09:05:55 UTC 2019 - Martin Vidner <mvidner@suse.com>
|
||||||
|
|
||||||
|
16
kbd.spec
16
kbd.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package kbd
|
# spec file for package kbd
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -12,7 +12,7 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@ -28,7 +28,7 @@ Summary: Keyboard and Font Utilities
|
|||||||
# git: git://git.altlinux.org/people/legion/packages/kbd.git
|
# git: git://git.altlinux.org/people/legion/packages/kbd.git
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: System/Console
|
Group: System/Console
|
||||||
Url: ftp://ftp.altlinux.org/pub/people/legion/kbd/
|
URL: ftp://ftp.altlinux.org/pub/people/legion/kbd/
|
||||||
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
|
# ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.xz repack_kbd.sh
|
||||||
Source: %{name}-%{version}-repack.tar.xz
|
Source: %{name}-%{version}-repack.tar.xz
|
||||||
Source1: kbd_fonts.tar.bz2
|
Source1: kbd_fonts.tar.bz2
|
||||||
@ -274,8 +274,8 @@ install -m 755 fbtest %{buildroot}%{_sbindir}
|
|||||||
install -d %{buildroot}%{_libexecdir}/%{name}
|
install -d %{buildroot}%{_libexecdir}/%{name}
|
||||||
install -m 755 numlockbios %{buildroot}%{_libexecdir}/%{name}
|
install -m 755 numlockbios %{buildroot}%{_libexecdir}/%{name}
|
||||||
%endif
|
%endif
|
||||||
install -d %{buildroot}%{_sysconfdir}/pam.d
|
install -d %{buildroot}%{_distconfdir}/pam.d
|
||||||
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
|
install -m 644 %{SOURCE4} %{buildroot}%{_distconfdir}/pam.d/vlock
|
||||||
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
|
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
|
||||||
install -m 755 %{SOURCE13} %{buildroot}%{_bindir}/guess_encoding
|
install -m 755 %{SOURCE13} %{buildroot}%{_bindir}/guess_encoding
|
||||||
install -m 755 %{SOURCE14} %{buildroot}%{_bindir}/kbd
|
install -m 755 %{SOURCE14} %{buildroot}%{_bindir}/kbd
|
||||||
@ -371,6 +371,8 @@ install -m0644 kbdsettings.service %{buildroot}%{_prefix}/lib/systemd/system
|
|||||||
|
|
||||||
%pre
|
%pre
|
||||||
%{service_add_pre kbdsettings.service}
|
%{service_add_pre kbdsettings.service}
|
||||||
|
# move outdated pam.d/*.rpmsave files away
|
||||||
|
test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vlock.rpmsave.old ||:
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%{fillup_only -n console}
|
%{fillup_only -n console}
|
||||||
@ -393,6 +395,8 @@ sed -i 's/^KBD_NUMLOCK="bios"/KBD_NUMLOCK="no"/' /etc/sysconfig/keyboard
|
|||||||
|
|
||||||
%posttrans
|
%posttrans
|
||||||
%{?regenerate_initrd_posttrans}
|
%{?regenerate_initrd_posttrans}
|
||||||
|
# Migration to /usr/etc.
|
||||||
|
test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vlock ||:
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
#config(noreplace) /etc/sysconfig/console
|
#config(noreplace) /etc/sysconfig/console
|
||||||
@ -515,7 +519,7 @@ sed -i 's/^KBD_NUMLOCK="bios"/KBD_NUMLOCK="no"/' /etc/sysconfig/keyboard
|
|||||||
%{_mandir}/man8/setvesablank.8%{ext_man}
|
%{_mandir}/man8/setvesablank.8%{ext_man}
|
||||||
%{_mandir}/man8/setvtrgb.8%{ext_man}
|
%{_mandir}/man8/setvtrgb.8%{ext_man}
|
||||||
%{_mandir}/man8/vcstime.8%{ext_man}
|
%{_mandir}/man8/vcstime.8%{ext_man}
|
||||||
%config(noreplace) %{_sysconfdir}/pam.d/vlock
|
%{_distconfdir}/pam.d/vlock
|
||||||
%dir %{_datadir}/systemd
|
%dir %{_datadir}/systemd
|
||||||
%{_prefix}/lib/systemd/system/kbdsettings.service
|
%{_prefix}/lib/systemd/system/kbdsettings.service
|
||||||
%{_datadir}/systemd/kbd-model-map.xkb-generated
|
%{_datadir}/systemd/kbd-model-map.xkb-generated
|
||||||
|
Loading…
Reference in New Issue
Block a user