pool/plasma5-workspace
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 544819 from home:RBrownSUSE:branches:KDE:Frameworks5

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544819
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=364
This commit is contained in:
Luca Beltrame
2017-11-23 15:52:37 +00:00
committed by Git OBS Bridge
parent d68a5dede6
commit 3345316eb5
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plasma5-workspace.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:52:44 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 7 15:15:47 CET 2017 - fabian@ritter-vogt.de Tue Nov 7 15:15:47 CET 2017 - fabian@ritter-vogt.de

9
plasma5-workspace.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
%define kf5_version 5.34.0 %define kf5_version 5.34.0
%bcond_without lang %bcond_without lang
@@ -305,8 +310,8 @@ if [ -f /etc/sysconfig/windowmanager ]; then
OLD_DEFAULTWM=`grep "DEFAULT_WM" /etc/sysconfig/windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2` OLD_DEFAULTWM=`grep "DEFAULT_WM" /etc/sysconfig/windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2`
fi fi
if [ -f /var/adm/fillup-templates/sysconfig.windowmanager ]; then if [ -f %{_fillupdir}/sysconfig.windowmanager ]; then
TEMPLATE_DEFAULTWM=`grep "DEFAULT_WM" /var/adm/fillup-templates/sysconfig.windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2` TEMPLATE_DEFAULTWM=`grep "DEFAULT_WM" %{_fillupdir}/sysconfig.windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2`
fi fi
# Check the old DEFAULT_WM and whether current DEFAULT_WM exists # Check the old DEFAULT_WM and whether current DEFAULT_WM exists