diff --git a/fonts-config.changes b/fonts-config.changes index 2ca08de..2cd495e 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:49:51 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Wed Sep 21 13:35:53 UTC 2016 - ftake@geeko.jp diff --git a/fonts-config.spec b/fonts-config.spec index 61b894e..362660c 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -1,7 +1,7 @@ # # spec file for package fonts-config # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,20 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %define infinality_srcver 1-20130104_1 %define infinality_name fontconfig-infinality Name: fonts-config Version: 20160921 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 @@ -84,10 +89,10 @@ mkdir -p %{buildroot}%{_prefix}/sbin mkdir -p %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}/%{_mandir}/man1 mkdir -p %{buildroot}/%{_docdir}/%{name}/infinality -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +mkdir -p %{buildroot}%{_fillupdir} install -m 755 %{SOURCE0} %{buildroot}%{_prefix}/sbin install -m 644 %{SOURCE1} \ - %{buildroot}%{_localstatedir}/adm/fillup-templates/ + %{buildroot}%{_fillupdir}/ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/fonts-config install -m 644 infinality/README infinality/LICENSE %{buildroot}%{_docdir}/%{name}/infinality install -m 644 infinality/conf.src/generate60/60-group-non-tt-fonts.list %{buildroot}%{_docdir}/%{name}/infinality/good-hinted-tt-fonts.list @@ -140,7 +145,7 @@ exit 0 %{_datadir}/fonts-config/*.template %{_mandir}/man1/fonts-config.1.gz %{_docdir}/%{name} -%{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config +%{_fillupdir}/sysconfig.fonts-config %{_fontsconfavaildir}/*.conf %config %{_fontsconfddir}/*.conf