- 10-rendering-options.conf and 58-family-prefer-local.conf are

generated in every fonts-config call and as such should not
  be under /usr/share/fonts-config/conf.avail but under
  /etc/fonts/conf.d/ [bnc#882029]

OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=53
This commit is contained in:
Petr Gajdos 2014-06-11 09:55:22 +00:00 committed by Git OBS Bridge
parent 0213cadb57
commit bec604845b
2 changed files with 20 additions and 6 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jun 11 09:53:01 UTC 2014 - pgajdos@suse.com
- 10-rendering-options.conf and 58-family-prefer-local.conf are
generated in every fonts-config call and as such should not
be under /usr/share/fonts-config/conf.avail but under
/etc/fonts/conf.d/ [bnc#882029]
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 4 06:22:54 UTC 2014 - pgajdos@suse.com Wed Jun 4 06:22:54 UTC 2014 - pgajdos@suse.com

View File

@ -95,9 +95,16 @@ pod2man --section 1 --center=" " %{SOURCE0} > \
%{buildroot}/%{_mandir}/man1/fonts-config.1 %{buildroot}/%{_mandir}/man1/fonts-config.1
# #
install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/%{name} install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/%{name}
mkdir %{buildroot}%{_datadir}/%{name}/conf.avail/ mkdir -p %{buildroot}%{_fontsconfavaildir}
for conf in 10-rendering-options.conf \ # following two conf files can not be under /usr/share/fonts-config
10-group-tt-hinted-fonts.conf \ # as they are changed during installation [bnc#882029 (internal)]
mkdir -p %{buildroot}%{_fontsconfddir}
for conf in 10-rendering-options.conf \
58-family-prefer-local.conf; do
install -m 644 $conf %{buildroot}%{_fontsconfddir}
done
#
for conf in 10-group-tt-hinted-fonts.conf \
10-group-tt-non-hinted-fonts.conf \ 10-group-tt-non-hinted-fonts.conf \
11-base-rendering.conf \ 11-base-rendering.conf \
12-tt-monospace-rendering.conf \ 12-tt-monospace-rendering.conf \
@ -105,10 +112,9 @@ for conf in 10-rendering-options.conf \
13-selective-rendering-ipa.conf \ 13-selective-rendering-ipa.conf \
31-metric-aliases-bw.conf \ 31-metric-aliases-bw.conf \
49-family-default.conf \ 49-family-default.conf \
58-family-prefer-local.conf \
60-family-prefer.conf \ 60-family-prefer.conf \
61-wine-aliases.conf \ 61-wine-aliases.conf \
70-reject.conf; do \ 70-reject.conf; do
install -m 644 $conf %{buildroot}%{_datadir}/%{name}/conf.avail/ install -m 644 $conf %{buildroot}%{_datadir}/%{name}/conf.avail/
%link_avail_to_system_fontsconf $conf %link_avail_to_system_fontsconf $conf
done done
@ -134,6 +140,6 @@ exit 0
%{_docdir}/%{name} %{_docdir}/%{name}
%{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config %{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config
%{_fontsconfavaildir}/*.conf %{_fontsconfavaildir}/*.conf
%{_fontsconfddir}/*.conf %config %{_fontsconfddir}/*.conf
%changelog %changelog