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

Accepting request 544685 from home:RBrownSUSE:branches:Base:System

Browse Source 
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:
Dirk Mueller 2017-11-24 10:20:30 +00:00 committed by Git OBS Bridge
parent 9aba4192cd
commit 8cd8567126
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kbd.changes
View File

@ -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
View File

@ -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