Hello community, here is the log from the commit of package fonts-config for openSUSE:Leap:15.2 checked in at 2020-06-21 21:58:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/fonts-config (Old) and /work/SRC/openSUSE:Leap:15.2/.fonts-config.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fonts-config" Sun Jun 21 21:58:45 2020 rev:14 rq:815909 version:20200609+git0.42e2b1b Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/fonts-config/fonts-config.changes 2020-01-15 14:55:28.689590253 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.fonts-config.new.3606/fonts-config.changes 2020-06-21 21:58:49.764055532 +0200 @@ -1,0 +2,60 @@ +Tue Jun 9 09:45:34 UTC 2020 - Antonio Larrosa <[email protected]> + +- Add a _service file +- Add code in %post to check the value of + FORCE_MODIFY_DEFAULT_FONT_SETTINGS_IN_NEXT_UPDATE and if it's + set to yes, empty or it doesn't exist, then update the values + of FORCE_HINTSTYLE, USE_LCDFILTER and USE_RGBA in + /etc/sysconfig/fonts-config to use the default settings + established in the 20181211 release (boo#1172022) +- Update to 20200609+git0.42e2b1b: + * Add variable to allow fonts-config to update default settings + * Fix en-US, en-GB font matching + +------------------------------------------------------------------- +Sat Jan 19 13:43:32 UTC 2019 - Karl Cheng <[email protected]> + +- Update to 20190119 + * Allow non-ASCII letters in font names (boo#1049056, bnc#1101985). + +------------------------------------------------------------------- +Tue Dec 11 13:49:51 UTC 2018 - [email protected] + +- Update to 20181211 + * Update subpixel rendering config + * Fix missspelling issue (boo#1111791). so + Drop fonts-config-fix-misspelling.patch + * Fix (boo#1092737). + * other minor tidyups + +------------------------------------------------------------------- +Mon Nov 5 11:18:01 UTC 2018 - Jan Engelhardt <[email protected]> + +- Use noun phrasing and user-independent wording. + +------------------------------------------------------------------- +Mon Oct 15 08:25:11 UTC 2018 - [email protected] + +- Add fonts-config-fix-misspelling.patch: fix misspelling in + configuration file(boo#1111791). + +------------------------------------------------------------------- +Mon Apr 30 03:40:53 UTC 2018 - [email protected] + +- new upstream: https://github.com/openSUSE/fonts-config + development will continue there. +- drop patch: fontconfig-infinality-generate-tt-groups.patch + * infinality project is dead, we use a static result in upstream + instead of generating it every time. +- update 20180430 + * support color emoji + * modern fonts for symbol + * add configurations for Noto Sans/Serif CJK + +------------------------------------------------------------------- +Mon Mar 12 22:53:10 UTC 2018 - [email protected] + +- Do not create fonts.{dir,scale} in encodings directory + (boo#1106850). + +------------------------------------------------------------------- @@ -601 +660,0 @@ - Old: ---- 10-rendering-options.conf.template 11-base-rendering.conf 12-tt-monospace-rendering.conf 13-selective-rendering-ipa.conf 31-metric-aliases-bw.conf 49-family-default.conf 59-family-prefer-lang-specific.conf 60-family-prefer.conf 70-reject.conf empty.conf fontconfig-infinality-1-20130104_1.tar.bz2 fontconfig-infinality-generate-tt-groups.patch fontconfig.SUSE.properties.template fonts-config sysconfig.fonts-config New: ---- _service fonts-config-20200609+git0.42e2b1b.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fonts-config.spec ++++++ --- /var/tmp/diff_new_pack.EFo11E/_old 2020-06-21 21:58:50.104057482 +0200 +++ /var/tmp/diff_new_pack.EFo11E/_new 2020-06-21 21:58:50.108057506 +0200 @@ -1,7 +1,7 @@ # # spec file for package fonts-config # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,30 +21,14 @@ %define _fillupdir /var/adm/fillup-templates %endif -%define infinality_srcver 1-20130104_1 -%define infinality_name fontconfig-infinality Name: fonts-config -Version: 20160921 +Version: 20200609+git0.42e2b1b Release: 0 -Summary: Configures Fonts for X Windows and other applications +Summary: Script to configure fonts for X Windows and other applications # MIT for infinality -License: GPL-2.0+ and MIT +License: GPL-2.0-or-later AND MIT Group: System/X11/Fonts -Source0: fonts-config -Source1: sysconfig.fonts-config -Source2: fontconfig.SUSE.properties.template -Source3: %{infinality_name}-%{infinality_srcver}.tar.bz2 -Source4: 10-rendering-options.conf.template -Source5: 11-base-rendering.conf -Source6: empty.conf -Source7: 12-tt-monospace-rendering.conf -Source8: 13-selective-rendering-ipa.conf -Source9: 49-family-default.conf -Source10: 60-family-prefer.conf -Source11: 70-reject.conf -Source12: 31-metric-aliases-bw.conf -Source13: 59-family-prefer-lang-specific.conf -Patch0: fontconfig-infinality-generate-tt-groups.patch +Source: %{name}-%{version}.tar.xz BuildRequires: fontconfig BuildRequires: fontpackages-devel Requires(pre): %fillup_prereq @@ -58,30 +42,20 @@ BuildArch: noarch %description -Configures Fonts for X Windows and other applications. +A script to configure fonts for X Windows and other applications. -Usually fonts-config is called automatically when package containing -font is installed, upgraded or removed. But you can also execute -fonts-config directly, which is mainly useful to debug it (use ---debug flag). +fonts-config is usually called automatically when a package containing +fonts is installed, upgraded or removed. But it can also be executed +directly, which is mainly useful to debug it (use the --debug flag). %prep -%setup -cT -a 3 -n %{infinality_name}-%{infinality_srcver} -%patch0 +%setup %build -cd infinality/conf.src/generate60 -./generate60.sh -mv 60-group-tt-fonts.conf ../../../10-group-tt-hinted-fonts.conf -mv 60-group-non-tt-fonts.conf ../../../10-group-tt-non-hinted-fonts.conf -cd ../../.. # empty configuration now, should be filled after fonts-config call -cp %{SOURCE6} 10-rendering-options.conf +cp 99-example.conf 10-rendering-options.conf # empty configuration now, can be filled after fonts-config call -cp %{SOURCE6} 58-family-prefer-local.conf -mv infinality/conf.src/80-selective-rendering-inf-win-lin.conf 13-selective-rendering.conf -mv infinality/conf.src/21-aliases-wine-linux.conf 61-wine-aliases.conf -cp -a %{SOURCE5} %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} . +cp 99-example.conf 58-family-prefer-local.conf %install mkdir -p %{buildroot}/sbin/conf.d @@ -90,17 +64,14 @@ mkdir -p %{buildroot}/%{_mandir}/man1 mkdir -p %{buildroot}/%{_docdir}/%{name}/infinality mkdir -p %{buildroot}%{_fillupdir} -install -m 755 %{SOURCE0} %{buildroot}%{_prefix}/sbin -install -m 644 %{SOURCE1} \ +install -m 755 fonts-config %{buildroot}%{_prefix}/sbin +install -m 644 sysconfig.fonts-config \ %{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 -install -m 644 infinality/conf.src/generate60/60-group-tt-fonts.list %{buildroot}%{_docdir}/%{name}/infinality/non-hinted-tt-fonts.list -pod2man --section 1 --center=" " %{SOURCE0} > \ +install -m 644 fontconfig.SUSE.properties.template %{buildroot}%{_datadir}/fonts-config +pod2man --section 1 --center=" " fonts-config > \ %{buildroot}/%{_mandir}/man1/fonts-config.1 # -install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/%{name} +install -m 644 10-rendering-options.conf.template %{buildroot}%{_datadir}/%{name} mkdir -p %{buildroot}%{_fontsconfavaildir} # following two conf files can not be under /usr/share/fonts-config # as they are changed during installation [bnc#882029 (internal)] @@ -116,7 +87,10 @@ 12-tt-monospace-rendering.conf \ 13-selective-rendering.conf \ 13-selective-rendering-ipa.conf \ + 21-emoji-rendering.conf \ 31-metric-aliases-bw.conf \ + 32-emoji-reject.conf \ + 32-symbol-substitution.conf \ 49-family-default.conf \ 59-family-prefer-lang-specific.conf \ 60-family-prefer.conf \ @@ -127,6 +101,28 @@ done %post +if [ -f %{_sysconfdir}/sysconfig/fonts-config ]; then + update=$(grep "^FORCE_MODIFY_DEFAULT_FONT_SETTINGS_IN_NEXT_UPDATE=" %{_sysconfdir}/sysconfig/fonts-config | sed -e 's/.*="//;s/"$//') + if [ -z "$update" -o "$update" = "yes" ]; then + echo "Updating default font settings..." + force_hintstyle=$(grep "^FORCE_HINTSTYLE=" /usr/share/fillup-templates/sysconfig.fonts-config | sed -e 's/.*=//') + use_lcdfilter=$(grep "^USE_LCDFILTER=" /usr/share/fillup-templates/sysconfig.fonts-config | sed -e 's/.*=//') + use_rgba=$(grep "^USE_RGBA=" /usr/share/fillup-templates/sysconfig.fonts-config | sed -e 's/.*=//') + if [ ! -f %{_sysconfdir}/sysconfig/fonts-config.rpmsave ]; then + cp %{_sysconfdir}/sysconfig/fonts-config %{_sysconfdir}/sysconfig/fonts-config.rpmsave + fi + sed -i -e '14,16s/^## Default: none$/## Default: '"$force_hintstyle"/ \ + -e 's/^FORCE_HINTSTYLE="none"$/FORCE_HINTSTYLE='"$force_hintstyle"/ \ + -e 's/^## Default: lcdnone$/## Default: '"$use_lcdfilter"/ \ + -e 's/^USE_LCDFILTER="lcdnone"$/USE_LCDFILTER='"$use_lcdfilter"/ \ + -e '76,78s/^## Default: none$/## Default: '"$use_rgba"/ \ + -e 's/^USE_RGBA="none"$/USE_RGBA='"$use_rgba"/ \ + %{_sysconfdir}/sysconfig/fonts-config + fi +fi +# Note that the above code should run before fillup merges the (maybe new) +# FORCE_MODIFY_DEFAULT_FONT_SETTINGS_IN_NEXT_UPDATE variable +# in a system being updated. %{fillup_only -n fonts-config} %reconfigure_fonts_post -c exit 0 ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/openSUSE/fonts-config</param> <param name="scm">git</param> <param name="versionformat">%cs+git0.%h</param> <param name="revision">master</param> <param name="filename">fonts-config</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services>
