Hello community, here is the log from the commit of package wqy-zenhei-fonts for openSUSE:Factory checked in at 2013-03-14 17:31:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wqy-zenhei-fonts (Old) and /work/SRC/openSUSE:Factory/.wqy-zenhei-fonts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wqy-zenhei-fonts", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/wqy-zenhei-fonts/wqy-zenhei-fonts.changes 2012-10-24 10:24:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wqy-zenhei-fonts.new/wqy-zenhei-fonts.changes 2013-03-14 17:31:20.000000000 +0100 @@ -1,0 +2,24 @@ +Mon Jan 21 23:53:22 UTC 2013 - [email protected] + +- with %enable_setup_ui 0, don't build sub-package zenhei-config, + leave these scripts as document + +------------------------------------------------------------------- +Sun Jan 20 16:43:05 UTC 2013 - [email protected] + +- remove wqy-zenhei-font-config-fixes.diff + re-diff to fix "Having multiple values in <test> isn't supported and may + not works as expected" +- add a simple setup UI in sub-package zenhei-config +- Upstream release note: +- update documents to prepare the release of v1.0 RC1 +- fixing a scaling factor bug for radicals by a new build +- added wqy-zenhei-cfg script to set user preference +- changed zenheiset for the new config files +- new build with improved parameters +- updated algorithm to compute glyph top margin +- fine-tuned P,XG,D,HZW and *G strokes +- all CJK Han glyphs moved upward for 10 units (EM=1024) +- fixed a bug for all characters involving U4EB6 as a component + +------------------------------------------------------------------- Old: ---- wqy-zenhei-0.9.41-May.tar.bz2 wqy-zenhei-font-config-fixes.diff New: ---- wqy-zenhei-0.9.45.tar.bz2 wqy-zenhei-sharp.conf.diff wqy-zenhei.conf.diff zenhei-config.desktop.diff zenheiset.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wqy-zenhei-fonts.spec ++++++ --- /var/tmp/diff_new_pack.8aYCpe/_old 2013-03-14 17:31:22.000000000 +0100 +++ /var/tmp/diff_new_pack.8aYCpe/_new 2013-03-14 17:31:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package wqy-zenhei-fonts # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,17 +16,21 @@ # +%define enable_setup_ui 0 Name: wqy-zenhei-fonts -Version: 0.9.41 +Version: 0.9.45 Release: 0 Summary: Open-source Chinese Font for Hei Ti License: GPL-2.0-with-font-exception Group: System/X11/Fonts Url: http://wenq.org -Source0: wqy-zenhei-%{version}-May.tar.bz2 +Source0: wqy-zenhei-%{version}.tar.bz2 BuildRequires: fontpackages-devel # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch0: wqy-zenhei-font-config-fixes.diff +Patch0: wqy-zenhei.conf.diff +Patch1: wqy-zenhei-sharp.conf.diff +Patch2: zenhei-config.desktop.diff +Patch3: zenheiset.diff %reconfigure_fonts_prereq Requires(pre): fontconfig Provides: scalable-font-zh-CN @@ -70,33 +74,76 @@ We wish you enjoying the font, and joining us to continuously improve this font for better performance and wider applications. +%if %{enable_setup_ui} +%package -n zenhei-config +Summary: Wqy-zenhei-font configuration tool +Group: System/I18n/Chinese +BuildRequires: update-desktop-files +Requires: %{name} = %{version} +Requires: zenity + +%description -n zenhei-config +Wqy-zenhei-font configuration tool, use it to set the preference of zenhei-font +%endif + %prep %setup -n wqy-zenhei -%patch0 -p1 +%patch0 +%patch1 +%patch2 +%patch3 %build # Do nothing for build %install + +%if %{enable_setup_ui} +mkdir -p %{buildroot}%{_bindir} +install -c -m 755 zenheiset %{buildroot}%{_bindir}/zenheiset +install -c -m 755 wqy-zenhei-cfg %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_datadir}/applications +install -c -m 644 zenhei-config.desktop %{buildroot}%{_datadir}/applications/ +%suse_update_desktop_file zenhei-config + +for lang in zh zh_CN zh_HK zh_TW ; do + mkdir -p %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES + cp i18n/$lang/wqy-zenhei.mo %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES/wqy-zenhei-cfg.mo +done +mkdir -p %{buildroot}%{_datadir}/pixmaps +install -c -m 644 pixmap/wqy-zenhei-cfg.png %{buildroot}%{_datadir}/pixmaps/ +%endif + mkdir -p %{buildroot}%{_ttfontsdir} mkdir -p %{buildroot}%{_fontsconfavaildir} install -c -m 644 wqy-zenhei.ttc %{buildroot}%{_ttfontsdir} #44- is too early to include in, embeddedbitmap will be enabled later, so move to 57- install -c -m 644 44-wqy-zenhei.conf %{buildroot}%{_fontsconfavaildir}/57-wqy-zenhei.conf -install -c -m 644 66-wqy-zenhei-sharp.conf %{buildroot}%{_fontsconfavaildir}/57-wqy-zenhei-sharp.conf -install -c -m 644 66-wqy-zenhei-sharp-no13px.conf %{buildroot}%{_fontsconfavaildir}/57-wqy-zenhei-sharp-no13px.conf +install -c -m 644 43-wqy-zenhei-sharp.conf %{buildroot}%{_fontsconfavaildir}/57-wqy-zenhei-sharp.conf %link_avail_to_system_fontsconf 57-wqy-zenhei.conf %reconfigure_fonts_scriptlets -c %files %defattr(-, root,root) -%doc ChangeLog AUTHORS COPYING README WQY_ZENHEI_MONTHLY_BUILD zenheiset +%if %{enable_setup_ui} +%doc ChangeLog AUTHORS COPYING README +%else +%doc ChangeLog AUTHORS COPYING README zenheiset +%endif %dir %{_datadir}/fonts/truetype %{_ttfontsdir}/wqy-zenhei.ttc %files_fontsconf_availdir %files_fontsconf_file -l 57-wqy-zenhei.conf %files_fontsconf_file 57-wqy-zenhei-sharp.conf -%files_fontsconf_file 57-wqy-zenhei-sharp-no13px.conf + +%if %{enable_setup_ui} +%files -n zenhei-config +%defattr(-, root,root) +%{_bindir}/* +%{_datadir}/applications/* +%{_datadir}/pixmaps/* +%{_datadir}/locale/*/LC_MESSAGES/wqy-zenhei-cfg.mo +%endif %changelog ++++++ wqy-zenhei-0.9.41-May.tar.bz2 -> wqy-zenhei-0.9.45.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wqy-zenhei-fonts/wqy-zenhei-0.9.41-May.tar.bz2 /work/SRC/openSUSE:Factory/.wqy-zenhei-fonts.new/wqy-zenhei-0.9.45.tar.bz2 differ: char 11, line 1 ++++++ wqy-zenhei-sharp.conf.diff ++++++ --- 43-wqy-zenhei-sharp.conf-orig 2009-10-03 23:19:23.000000000 +0800 +++ 43-wqy-zenhei-sharp.conf 2013-01-20 21:42:33.505729834 +0800 @@ -2,11 +2,24 @@ <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <!-- WenQuanYi Zen Hei Configure File --> <fontconfig> + <match target="font"> + <test qual="any" name="family"> + <string>WenQuanYi Zen Hei Sharp</string> + <string>文泉驿点阵正黑</string> + <string>文泉驛點陣正黑</string> + </test> + <test compare="more_eq" name="pixelsize"><double>12</double></test> + <test compare="less_eq" name="pixelsize"><double>16</double></test> + <edit name="antialias" mode="assign"><bool>false</bool></edit> + <edit name="embeddedbitmap" mode="assign"><bool>true</bool></edit> + <edit name="hinting" mode="assign"><bool>false</bool></edit> + </match> + <alias> <family>serif</family> <prefer> - <family>Bitstream Vera Serif</family> <family>DejaVu Serif</family> + <family>Bitstream Vera Serif</family> <family>WenQuanYi Zen Hei Sharp</family> </prefer> </alias> @@ -18,4 +31,13 @@ <family>WenQuanYi Zen Hei Sharp</family> </prefer> </alias> + <alias> + <family>monospace</family> + <prefer> + <family>DejaVu Sans Mono</family> + <family>Bitstream Vera Sans Mono</family> + <family>WenQuanYi Zen Hei Sharp</family> + </prefer> + </alias> + </fontconfig> ++++++ wqy-zenhei-font-config-fixes.diff -> wqy-zenhei.conf.diff ++++++ --- /work/SRC/openSUSE:Factory/wqy-zenhei-fonts/wqy-zenhei-font-config-fixes.diff 2012-10-24 10:24:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wqy-zenhei-fonts.new/wqy-zenhei.conf.diff 2013-03-14 17:31:20.000000000 +0100 @@ -1,154 +1,14 @@ ---- - 44-wqy-zenhei.conf | 32 -------------------------------- - 66-wqy-zenhei-sharp.conf | 40 ---------------------------------------- - 2 files changed, 72 deletions(-) - -Index: wqy-zenhei/44-wqy-zenhei.conf -=================================================================== ---- wqy-zenhei.orig/44-wqy-zenhei.conf -+++ wqy-zenhei/44-wqy-zenhei.conf -@@ -6,41 +6,19 @@ +--- 44-wqy-zenhei.conf-orig 2009-05-18 04:25:41.000000000 +0800 ++++ 44-wqy-zenhei.conf 2013-01-20 18:29:30.000000000 +0800 +@@ -6,7 +6,11 @@ <match target="font"> <test qual="any" name="family"> <string>WenQuanYi Zen Hei</string> -+ </test> -+ <edit name="globaladvance"><bool>false</bool></edit> -+ </match> -+ <match target="font"> -+ <test qual="any" name="family"> ++ </test> ++ <test qual="any" name="family"> <string>文泉驿正黑</string> -+ </test> -+ <edit name="globaladvance"><bool>false</bool></edit> -+ </match> -+ <match target="font"> -+ <test qual="any" name="family"> ++ </test> ++ <test qual="any" name="family"> <string>文泉驛正黑</string> </test> <edit name="globaladvance"><bool>false</bool></edit> -- <edit name="spacing"><int>0</int></edit> -- <edit name="antialias" mode="assign"><bool>true</bool></edit> -- <edit name="hinting" mode="assign"><bool>true</bool></edit> -- <edit name="hintstyle" mode="assign"><const>hintnone</const></edit> -- <edit name="autohint" mode="assign"><bool>false</bool></edit> -- <edit name="rh_prefer_bitmaps" mode="assign"><bool>false</bool></edit> -- <edit name="rgba" mode="assign"><const>none</const></edit> -- <edit name="embeddedbitmap"><bool>false</bool></edit> - </match> -- <alias> -- <family>serif</family> -- <prefer> -- <family>Bitstream Vera Serif</family> -- <family>DejaVu Serif</family> -- <family>WenQuanYi Zen Hei</family> -- </prefer> -- </alias> -- <alias> -- <family>sans-serif</family> -- <prefer> -- <family>DejaVu Sans</family> -- <family>Bitstream Vera Sans</family> -- <family>WenQuanYi Zen Hei</family> -- </prefer> -- </alias> -- <alias> -- <family>monospace</family> -- <prefer> -- <family>DejaVu Sans Mono</family> -- <family>Bitstream Vera Sans Mono</family> -- <family>WenQuanYi Zen Hei Mono</family> -- </prefer> -- </alias> - </fontconfig> -Index: wqy-zenhei/66-wqy-zenhei-sharp.conf -=================================================================== ---- wqy-zenhei.orig/66-wqy-zenhei-sharp.conf -+++ wqy-zenhei/66-wqy-zenhei-sharp.conf -@@ -5,51 +5,25 @@ - <match target="font"> - <test qual="any" name="family"> - <string>WenQuanYi Zen Hei Sharp</string> -- <string>文泉驿点阵正黑</string> -- <string>文泉驛點陣正黑</string> - </test> - <test compare="more_eq" name="pixelsize"><double>12</double></test> - <test compare="less_eq" name="pixelsize"><double>16</double></test> -- <edit name="antialias" mode="assign"><bool>false</bool></edit> - <edit name="embeddedbitmap" mode="assign"><bool>true</bool></edit> -- <edit name="hinting" mode="assign"><bool>false</bool></edit> - </match> -- --<!-- ZenHei now has 13px bitmaps, the following rules are disabled -- <match target="font"> -+ <match target="font"> - <test qual="any" name="family"> -- <string>WenQuanYi Zen Hei Sharp</string> - <string>文泉驿点阵正黑</string> -+ </test> -+ <test compare="more_eq" name="pixelsize"><double>12</double></test> -+ <test compare="less_eq" name="pixelsize"><double>16</double></test> -+ <edit name="embeddedbitmap" mode="assign"><bool>true</bool></edit> -+ </match> -+ <match target="font"> -+ <test qual="any" name="family"> - <string>文泉驛點陣正黑</string> - </test> -- <test compare="more_eq" name="pixelsize"><double>13.5</double></test> -- <test compare="less" name="pixelsize"><double>14.5</double></test> -- <edit name="pixelsize"><double>13</double></edit> -+ <test compare="more_eq" name="pixelsize"><double>12</double></test> -+ <test compare="less_eq" name="pixelsize"><double>16</double></test> -+ <edit name="embeddedbitmap" mode="assign"><bool>true</bool></edit> - </match> ----> -- <alias> -- <family>serif</family> -- <prefer> -- <family>DejaVu Serif</family> -- <family>Bitstream Vera Serif</family> -- <family>WenQuanYi Zen Hei Sharp</family> -- </prefer> -- </alias> -- <alias> -- <family>sans-serif</family> -- <prefer> -- <family>DejaVu Sans</family> -- <family>Bitstream Vera Sans</family> -- <family>WenQuanYi Zen Hei Sharp</family> -- </prefer> -- </alias> -- <alias> -- <family>monospace</family> -- <prefer> -- <family>DejaVu Sans Mono</family> -- <family>Bitstream Vera Sans Mono</family> -- <family>WenQuanYi Zen Hei Sharp</family> -- </prefer> -- </alias> -- - </fontconfig> -Index: wqy-zenhei/66-wqy-zenhei-sharp-no13px.conf -=================================================================== ---- wqy-zenhei.orig/66-wqy-zenhei-sharp-no13px.conf -+++ wqy-zenhei/66-wqy-zenhei-sharp-no13px.conf -@@ -6,7 +6,21 @@ - <match target="font"> - <test qual="any" name="family"> - <string>WenQuanYi Zen Hei Sharp</string> -+ </test> -+ <test compare="more_eq" name="pixelsize"><double>13.5</double></test> -+ <test compare="less" name="pixelsize"><double>14.5</double></test> -+ <edit name="pixelsize"><double>13</double></edit> -+ </match> -+ <match target="font"> -+ <test qual="any" name="family"> - <string>文泉驿点阵正黑</string> -+ </test> -+ <test compare="more_eq" name="pixelsize"><double>13.5</double></test> -+ <test compare="less" name="pixelsize"><double>14.5</double></test> -+ <edit name="pixelsize"><double>13</double></edit> -+ </match> -+ <match target="font"> -+ <test qual="any" name="family"> - <string>文泉驛點陣正黑</string> - </test> - <test compare="more_eq" name="pixelsize"><double>13.5</double></test> ++++++ zenhei-config.desktop.diff ++++++ --- zenhei-config.desktop-orig 2013-01-21 12:57:31.000000000 +0800 +++ zenhei-config.desktop 2013-01-21 14:37:50.000000000 +0800 @@ -1,18 +1,23 @@ [Desktop Entry] -Name=WenQuanYi Font Preference Setup -Name[ja]=WenQuanYiフォントの設定 -Name[ko]=WenQuanYi 글꼴설정 -Name[zh_CN]=文泉驿字体偏好设置 -Name[zh_TW]=文泉驛字體偏好設置 +Name=Zenhei Font Configuration +Name[ja]=フォントの設定 +Name[ko]=글꼴설정 +Name[zh_CN]=正黑字体设置 +Name[zh_TW]=正黑字體設定 +GenericName=WenQuanYi Font Preference Setup +GenericName[ja]=WenQuanYiフォントの設定 +GenericName[ko]=WenQuanYi 글꼴설정 +GenericName[zh_CN]=文泉驿字体偏好设置 +GenericName[zh_TW]=文泉驛字體偏好設定 Comment=Configure the default WenQuanYi Zen Hei font for your Chinese desktop Comment[ja]=中国語フォントを優先WenQuanYi Zen Hei ツール用のデスクトップ設定 Comment[ko]=중국의 글꼴을 최우선 WenQuanYi Zen Hei 도구를위한 데스크톱 환경 설정 Comment[zh_CN]=为中文桌面设定文泉驿字体优先级的工具 Comment[zh_TW]=為中文桌面設定文泉驛字體優先級的工具 -Exec=gksu wqy-zenhei-cfg +Exec=xdg-su -c wqy-zenhei-cfg Icon=wqy-zenhei-cfg Terminal=false Type=Application StartupNotify=true -Categories=Settings; +Categories=System;SystemSetup;Settings; #X-Ubuntu-Gettext-Domain=wqy-zenhei ++++++ zenheiset.diff ++++++ --- zenheiset-orig 2013-01-21 09:24:13.000000000 +0800 +++ zenheiset 2013-01-21 21:01:25.000000000 +0800 @@ -6,39 +6,30 @@ # Qianqian Fang <fangq at nmr.mgh.harvard.edu> ############################################### -FAVAIL=/etc/fonts/conf.avail +FAVAIL=/usr/share/wqy-zenhei-fonts/conf.avail FCONF=/etc/fonts/conf.d -BMPCONF=43-wqy-zenhei-sharp.conf -BMPSTDCONF=66-wqy-zenhei-sharp-no13px.conf -AACONF=44-wqy-zenhei.conf +BMPCONF=57-wqy-zenhei-sharp.conf +AACONF=57-wqy-zenhei.conf if [ $# -ne 1 ]; then - echo 1>&2 Usage: $0 \[aa\|bitmap\|bitmapfull\] + echo 1>&2 Usage: $0 \[aa\|bitmap\|cancel\] exit 2 fi -if [ $1 = "aa" -o $1 = "bitmap" -o $1 = "bitmapfull" ]; then +if [ $1 = "aa" -o $1 = "bitmap" -o $1 = "cancel" ]; then if [ -f "$FAVAIL/$AACONF" ]; then ln -sf $FAVAIL/$AACONF $FCONF/$AACONF rm -rf $FCONF/$BMPCONF - rm -rf $FCONF/$BMPSTDCONF else - echo $FAVAIL/$BMPCONF does not exist! + echo $FAVAIL/$AACONF does not exist! exit 2 fi - if [ $1 = "bitmap" -o $1 = "bitmapfull" ]; then + if [ $1 = "bitmap" -o $1 = "cancel" ]; then if [ -f "$FAVAIL/$BMPCONF" ]; then ln -sf $FAVAIL/$BMPCONF $FCONF/$BMPCONF - #if [ $1 = "bitmap" ]; then - # if [ -f "$FAVAIL/$BMPSTDCONF" ]; then - # ln -sf $FAVAIL/$BMPSTDCONF $FCONF/$BMPSTDCONF - # else - # echo $FAVAIL/$BMPSTDCONF does not exist! - # exit 2 - # fi - #fi + rm -rf $FCONF/$AACONF else echo $FAVAIL/$BMPCONF does not exist! exit 2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
