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

Accepting request 956359 from home:favogt:branches:Base:System

Browse Source 
- Fix build without %_distconfdir (see bsc#1195679)

OBS-URL: https://build.opensuse.org/request/show/956359
OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=145
This commit is contained in:
Anna Maresova 2022-03-03 10:29:56 +00:00 committed by Git OBS Bridge
parent 52dec60351
commit 92ac8cb52c
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kbd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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