pool/plasma5-workspace
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 544898 from 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/544898
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger
2017-11-30 11:37:31 +00:00
committed by Git OBS Bridge
parent 9066f95cff fd60219f76
commit f5db15c8dd
2 changed files with 11 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

7
plasma5-workspace.spec
View File

@@ -16,6 +16,9 @@
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%{!?_fillupdir: %global _fillupdir /var/adm/fillup-templates}
%define kf5_version 5.34.0
%bcond_without lang
@@ -305,8 +308,8 @@ if [ -f /etc/sysconfig/windowmanager ]; then
OLD_DEFAULTWM=`grep "DEFAULT_WM" /etc/sysconfig/windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2`
fi
if [ -f /var/adm/fillup-templates/sysconfig.windowmanager ]; then
TEMPLATE_DEFAULTWM=`grep "DEFAULT_WM" /var/adm/fillup-templates/sysconfig.windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2`
if [ -f %{_fillupdir}/sysconfig.windowmanager ]; then
TEMPLATE_DEFAULTWM=`grep "DEFAULT_WM" %{_fillupdir}/sysconfig.windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2`
fi
# Check the old DEFAULT_WM and whether current DEFAULT_WM exists