Accepting request 544685 from home:RBrownSUSE:branches:Base:System
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544685 OBS-URL: https://build.opensuse.org/package/show/Base:System/kbd?expand=0&rev=98
This commit is contained in:
parent
9aba4192cd
commit
8cd8567126
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 23 13:40:21 UTC 2017 - rbrown@suse.com
|
||||
|
||||
- Replace references to /var/adm/fillup-templates with new
|
||||
%_fillupdir macro (boo#1069468)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 13 14:53:41 CEST 2017 - sbrabec@suse.com
|
||||
|
||||
|
11
kbd.spec
11
kbd.spec
@ -16,6 +16,11 @@
|
||||
#
|
||||
|
||||
|
||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||
%if ! %{defined _fillupdir}
|
||||
%define _fillupdir /var/adm/fillup-templates
|
||||
%endif
|
||||
|
||||
Name: kbd
|
||||
Version: 2.0.4
|
||||
Release: 0
|
||||
@ -234,7 +239,7 @@ for i in \
|
||||
do test -f $i || ln -sv mac-us.map.gz $i
|
||||
done
|
||||
)
|
||||
FILLUP_DIR=%{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
FILLUP_DIR=%{buildroot}%{_fillupdir}
|
||||
mkdir -p $FILLUP_DIR
|
||||
install -m 644 %{SOURCE8} $FILLUP_DIR/sysconfig.console
|
||||
install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard
|
||||
@ -353,8 +358,8 @@ sh ./genmap4systemd.sh %{buildroot}%{kbd}/keymaps/xkb \
|
||||
#config(noreplace) /etc/sysconfig/console
|
||||
%doc %{_defaultdocdir}/kbd
|
||||
#doc COPYING CHANGES README CREDITS
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.console
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.keyboard
|
||||
%{_fillupdir}/sysconfig.console
|
||||
%{_fillupdir}/sysconfig.keyboard
|
||||
%{kbd}
|
||||
%exclude %{kbd}/keymaps/legacy
|
||||
#UsrMerge
|
||||
|
Loading…
Reference in New Issue
Block a user