From 1621d4c978eae12b99f561ca374d0d6521cfbce5ba732e271608f560c6d725ca Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 15 Aug 2015 18:38:39 +0000 Subject: [PATCH] Accepting request 323228 from home:AndreasSchwab:f - fonts-config: fix use of $ENV vars OBS-URL: https://build.opensuse.org/request/show/323228 OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=70 --- fonts-config | 4 ++-- fonts-config.changes | 5 +++++ fonts-config.spec | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fonts-config b/fonts-config index 3396681..ec7ee77 100644 --- a/fonts-config +++ b/fonts-config @@ -388,7 +388,7 @@ my %sysconfig_options = ( "GENERATE_JAVA_FONT_SETUP" , "OPT_JAVA", ); -my $xdg_prefix = "$HOME/.config/"; +my $xdg_prefix = "$ENV{HOME}/.config/"; my %files = ( "sysconfig file", "/etc/sysconfig/fonts-config", "user sysconfig file", "fontconfig/fonts-config", @@ -503,7 +503,7 @@ if ($OPT_REMOVE_USER_SETTING) { } if ($VERBOSITY >= $VERBOSITY_DEBUG) { - print $OPT_USER ? "USER mode ($USER)\n" : "SYSTEM mode\n"; + print $OPT_USER ? "USER mode ($ENV{USER})\n" : "SYSTEM mode\n"; } # diff --git a/fonts-config.changes b/fonts-config.changes index dfe8c72..fb20dea 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 14 21:40:04 UTC 2015 - schwab@linux-m68k.org + +- fonts-config: fix use of $ENV vars + ------------------------------------------------------------------- Fri Apr 24 08:20:24 UTC 2015 - pgajdos@suse.com diff --git a/fonts-config.spec b/fonts-config.spec index 74db991..b9273d9 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -22,9 +22,9 @@ Name: fonts-config Version: 20150424 Release: 0 Summary: Configures Fonts for X Windows and other applications +# MIT for infinality License: GPL-2.0+ and MIT Group: System/X11/Fonts -# MIT for infinality Source0: fonts-config Source1: sysconfig.fonts-config Source2: fontconfig.SuSE.properties.template