Accepting request 1054912 from home:lnussel:usrmerge
Replace transitional %usrmerged macro with regular version check (boo#1206798) OBS-URL: https://build.opensuse.org/request/show/1054912 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=154
This commit is contained in:
parent
7876c92676
commit
a622984135
@ -5,6 +5,11 @@ Sat Dec 31 12:29:16 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
|||||||
'U+00b0' needs to be 'dead_abovering' and not 'dead_grave' as we
|
'U+00b0' needs to be 'dead_abovering' and not 'dead_grave' as we
|
||||||
assumed before
|
assumed before
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Dec 27 12:35:19 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
|
||||||
|
|
||||||
|
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 8 06:54:58 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
|
Mon Aug 8 06:54:58 UTC 2022 - Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
|
||||||
|
4
kbd.spec
4
kbd.spec
@ -286,7 +286,7 @@ install -m 644 %{SOURCE4} %{buildroot}%{_pam_vendordir}/vlock
|
|||||||
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
|
install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/vlock
|
||||||
%endif
|
%endif
|
||||||
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
|
install -m 644 %{SOURCE12} %{buildroot}%{_mandir}/man8/
|
||||||
%if !0%{?usrmerged}
|
%if 0%{?suse_version} < 1550
|
||||||
mkdir -p %{buildroot}/bin
|
mkdir -p %{buildroot}/bin
|
||||||
mkdir -p %{buildroot}/sbin
|
mkdir -p %{buildroot}/sbin
|
||||||
ln -s %{_bindir}/chvt %{buildroot}/bin
|
ln -s %{_bindir}/chvt %{buildroot}/bin
|
||||||
@ -417,7 +417,7 @@ test -f /etc/pam.d/vlock.rpmsave && mv -v /etc/pam.d/vlock.rpmsave /etc/pam.d/vl
|
|||||||
%{_fillupdir}/sysconfig.keyboard
|
%{_fillupdir}/sysconfig.keyboard
|
||||||
%{kbd}
|
%{kbd}
|
||||||
%exclude %{kbd}/keymaps/{%{legacy_folders}}
|
%exclude %{kbd}/keymaps/{%{legacy_folders}}
|
||||||
%if !0%{?usrmerged}
|
%if 0%{?suse_version} < 1550
|
||||||
/sbin/fbtest
|
/sbin/fbtest
|
||||||
/bin/chvt
|
/bin/chvt
|
||||||
/bin/openvt
|
/bin/openvt
|
||||||
|
Loading…
Reference in New Issue
Block a user