Accepting request 545115 from Base:System
OBS-URL: https://build.opensuse.org/request/show/545115 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=85
This commit is contained in:
commit
13ac8a8c5a
@ -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
|
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
|
Name: kbd
|
||||||
Version: 2.0.4
|
Version: 2.0.4
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -234,7 +239,7 @@ for i in \
|
|||||||
do test -f $i || ln -sv mac-us.map.gz $i
|
do test -f $i || ln -sv mac-us.map.gz $i
|
||||||
done
|
done
|
||||||
)
|
)
|
||||||
FILLUP_DIR=%{buildroot}%{_localstatedir}/adm/fillup-templates
|
FILLUP_DIR=%{buildroot}%{_fillupdir}
|
||||||
mkdir -p $FILLUP_DIR
|
mkdir -p $FILLUP_DIR
|
||||||
install -m 644 %{SOURCE8} $FILLUP_DIR/sysconfig.console
|
install -m 644 %{SOURCE8} $FILLUP_DIR/sysconfig.console
|
||||||
install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard
|
install -m 644 %{SOURCE9} $FILLUP_DIR/sysconfig.keyboard
|
||||||
@ -353,8 +358,8 @@ sh ./genmap4systemd.sh %{buildroot}%{kbd}/keymaps/xkb \
|
|||||||
#config(noreplace) /etc/sysconfig/console
|
#config(noreplace) /etc/sysconfig/console
|
||||||
%doc %{_defaultdocdir}/kbd
|
%doc %{_defaultdocdir}/kbd
|
||||||
#doc COPYING CHANGES README CREDITS
|
#doc COPYING CHANGES README CREDITS
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.console
|
%{_fillupdir}/sysconfig.console
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.keyboard
|
%{_fillupdir}/sysconfig.keyboard
|
||||||
%{kbd}
|
%{kbd}
|
||||||
%exclude %{kbd}/keymaps/legacy
|
%exclude %{kbd}/keymaps/legacy
|
||||||
#UsrMerge
|
#UsrMerge
|
||||||
|
Loading…
Reference in New Issue
Block a user