rpms/fonts-chinese/devel fonts-chinese.spec, 1.45, 1.46 sources, 1.10, 1.11 CIDFnmap.zh_CN, 1.4, NONE CIDFnmap.zh_TW, 1.4, NONE FAPIcidfmap.zh_CN, 1.2, NONE FAPIcidfmap.zh_TW, 1.2, NONE cidfmap.zh_CN, 1.2, NONE cidfmap.zh_TW, 1.2, NONE

Jens Petersen (petersen) fedora-extras-commits at redhat.com
Fri Aug 31 08:18:01 UTC 2007 

Author: petersen

Update of /cvs/pkgs/rpms/fonts-chinese/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12542

Modified Files:
	fonts-chinese.spec sources 
Removed Files:
	CIDFnmap.zh_CN CIDFnmap.zh_TW FAPIcidfmap.zh_CN 
	FAPIcidfmap.zh_TW cidfmap.zh_CN cidfmap.zh_TW 
Log Message:
* Fri Aug 31 2007 Jens Petersen <petersen at redhat.com> - 3.03-10.fc8
- finish moving Uming and Ukai truetype fonts over to cjkunifonts (#266281):
- update summary and description
- drop scriptlets and their requires
- require new cjkunifonts-uming and cjkunifonts-ukai
- version ttfonts-zh_CN and ttfonts-zh_TW obsoletes
- run mkfontdir at buildtime and don't ghost fonts.dir
- don't generate fonts.scale

* Thu Aug 30 2007 Caius Chance <cchance at redhat.com>
- Resolves: rhbz#266281 (Remove uming and ukai from fonts-chinese.)
-- remove ttfontdir and cidmapdir
-- update license to Public Domain for taipeifonts
-- remove %{_datadir}/fonts/zh_*/TrueType/ compat dirs
-- remove fc-cache from post and postun scriptlets




Index: fonts-chinese.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/fonts-chinese.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- fonts-chinese.spec	27 Aug 2007 01:33:37 -0000	1.45
+++ fonts-chinese.spec	31 Aug 2007 08:17:29 -0000	1.46
@@ -1,44 +1,31 @@
 %define basefontdir    %{_datadir}/fonts/chinese
-%define ttfontdir      %{basefontdir}/TrueType
 %define miscfontdir    %{basefontdir}/misc
-%define cidmapdir      %{_sysconfdir}/ghostscript
 %define catalogue      /etc/X11/fontpath.d
 
-%define ver 0.1
-%define minor 20060928
 %define taipeiver 1.2
 
-Summary:      Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
+Summary:     Traditional Chinese bitmap fonts and meta-package for Chinese fonts
 Name:         fonts-chinese
 Version:      3.03
-Release:      9%{?dist}
-License:      Arphic Public License (GPL-like)
+Release:      10%{?dist}
+License:      Public Domain
 Group:        User Interface/X
 BuildArch:    noarch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 
-Source2:     taipeifonts-%{taipeiver}.tar.gz
-Source3:     http://ftp.debian.org/debian/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}.%{minor}.orig.tar.gz
-Source4:     http://ftp.debian.org/debian/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}.%{minor}.orig.tar.gz
-Source9:     taipeifonts.alias
-Source20:    FAPIcidfmap.zh_TW
-Source21:    FAPIcidfmap.zh_CN
-Source22:    cidfmap.zh_TW
-Source23:    cidfmap.zh_CN
-Source24:    CIDFnmap.zh_TW
-Source25:    CIDFnmap.zh_CN
+Source1:     taipeifonts-%{taipeiver}.tar.gz
+Source2:     taipeifonts.alias
 
-Requires(post):      ttmkfdir >= 3.0.6, xorg-x11-font-utils, fontconfig
-Requires(postun):    fontconfig
 BuildRequires:       xorg-x11-font-utils
-Obsoletes:           ttfonts-zh_CN ttfonts-zh_TW ttf-moe_sung ttf-moe_kai ttf-arphic_bming ttf-arphic_bkai taipeifonts
+Obsoletes:           ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28, ttf-moe_sung, ttf-moe_kai, ttf-arphic_bming, ttf-arphic_bkai, taipeifonts
+Requires:            cjkunifonts-uming, cjkunifonts-ukai
 
 %description
-Chinese TTF Fonts donated by Arphic company, with additional Hong Kong characters by Hong Kong font project and bitmap by F
-irefly. Read license files for details.
+This package includes some Traditional Chinese bitmap fonts and also acts
+as a meta-package for general Chinese fonts support.
 
 %prep
-%setup -q -T -c -a2 -a3 -a4
+%setup -q -T -c -a1
 
 %build
 pushd taipeifonts-%{taipeiver}/
@@ -50,122 +37,61 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{ttfontdir}
 install -d $RPM_BUILD_ROOT%{miscfontdir}
-install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
-install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType
-install -m 0644 ttf-arphic-ukai-%{ver}.%{minor}/ukai.ttf $RPM_BUILD_ROOT%{ttfontdir}/
-install -m 0644 ttf-arphic-uming-%{ver}.%{minor}/uming.ttf $RPM_BUILD_ROOT%{ttfontdir}/
 install -m 0644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
 install -m 0644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
 install -m 0644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
 install -m 0644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
-install -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
-
-# for ghostscript
-install -d $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE20} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE21} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE22} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE23} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE24} $RPM_BUILD_ROOT%{cidmapdir}/
-install -m 0644 %{SOURCE25} $RPM_BUILD_ROOT%{cidmapdir}/
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
 
 # for catalogue
 install -d $RPM_BUILD_ROOT%{catalogue}
-ln -sf %{ttfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-chinese
+ln -s %{miscfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}
 
 # for fonts.*
+mkfontdir $RPM_BUILD_ROOT%{miscfontdir}
+
 touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.dir
-touch $RPM_BUILD_ROOT%{ttfontdir}/fonts.scale
 touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
-touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.dir
-touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.scale
-
-# for backward compatibility
-touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-touch $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-{
-    umask 133
-
-    for tmpfontdir in %{ttfontdir} %{miscfontdir}
-    do
-        touch $tmpfontdir 2> /dev/null && {
-            %{_bindir}/ttmkfdir -d $tmpfontdir -o $tmpfontdir/fonts.scale
-            mkfontdir $tmpfontdir
-        }
-    done
-
-    #Update fontconfig cache
-    if [ -x %{_bindir}/fc-cache ]; then
-        %{_bindir}/fc-cache -s %{ttfontdir}
-    fi
-
-    # make symlinks for java referring to old path and fonts
-    ln -sf ../../chinese/TrueType/uming.ttf %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf || :
-    ln -sf ../../chinese/TrueType/uming.ttf %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf || :
-
-}
-
-%postun
-if [ "$1" = 0 ];
-then
-    umask 133
-
-    #Update fontconfig cache
-    if [ -x %{_bindir}/fc-cache ]; then
-        %{_bindir}/fc-cache -s %{ttfontdir}
-    fi
-fi
-
 %files
 %defattr(-, root, root)
-%doc ttf-arphic-uming-%{ver}.%{minor}/license
 %dir %{basefontdir}
-%dir %{ttfontdir}
 %dir %{miscfontdir}
-%dir %{cidmapdir}
-%dir %{_datadir}/fonts/zh_CN
-%dir %{_datadir}/fonts/zh_TW
-%dir %{_datadir}/fonts/zh_CN/TrueType
-%dir %{_datadir}/fonts/zh_TW/TrueType
-%{ttfontdir}/*.ttf
 %{miscfontdir}/*.gz
 %{miscfontdir}/fonts.alias
-%{cidmapdir}/FAPIcidfmap.zh_TW
-%{cidmapdir}/FAPIcidfmap.zh_CN
-%{cidmapdir}/cidfmap.zh_TW
-%{cidmapdir}/cidfmap.zh_CN
-%{cidmapdir}/CIDFnmap.zh_TW
-%{cidmapdir}/CIDFnmap.zh_CN
 %ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{ttfontdir}/fonts.scale
-%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.dir
-%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.scale
+%verify(not md5 size mtime) %{miscfontdir}/fonts.dir
 %ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1
-%ghost %verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-%ghost %verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
-%{catalogue}/fonts-chinese
-
+%{catalogue}/%{name}
 
 %changelog
+* Fri Aug 31 2007 Jens Petersen <petersen at redhat.com> - 3.03-10.fc8
+- finish moving Uming and Ukai truetype fonts over to cjkunifonts (#266281):
+- update summary and description
+- drop scriptlets and their requires
+- require new cjkunifonts-uming and cjkunifonts-ukai
+- version ttfonts-zh_CN and ttfonts-zh_TW obsoletes
+- run mkfontdir at buildtime and don't ghost fonts.dir
+- don't generate fonts.scale
+
+* Thu Aug 30 2007 Caius Chance <cchance at redhat.com>
+- Resolves: rhbz#266281 (Remove uming and ukai from fonts-chinese.)
+-- remove ttfontdir and cidmapdir
+-- update license to Public Domain for taipeifonts
+-- remove %{_datadir}/fonts/zh_*/TrueType/ compat dirs
+-- remove fc-cache from post and postun scriptlets
+
 * Mon Aug 27 2007 Caius Chance <cchance at redhat.com> - 3.03-9.fc8
 - Removed ownership of catalogue directory.
 
 * Tue Aug 21 2007 Jens Petersen <petersen at redhat.com>
-- add source urls for arphic fonts
+- add source urls for cjkunifonts
 - use %%setup macro
-- use arphic license from uming source
+- use Arphic license from uming source
 
 * Mon Aug 20 2007 Caius Chance <cchance at redhat.com> - 3.03-8.fc8
 - Specify TrueType font directory for fc-cache.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fonts-chinese/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	17 Aug 2007 08:40:15 -0000	1.10
+++ sources	31 Aug 2007 08:17:29 -0000	1.11
@@ -1,3 +1 @@
 9e4acdd5a218dea6aaa28bc80d472aad  taipeifonts-1.2.tar.gz
-4f2e5a4ba4cf3ac01518ea211a89fdc1  ttf-arphic-uming_0.1.20060928.orig.tar.gz
-465b1350911f086a2021c36e039f79c8  ttf-arphic-ukai_0.1.20060928.orig.tar.gz


--- CIDFnmap.zh_CN DELETED ---


--- CIDFnmap.zh_TW DELETED ---


--- FAPIcidfmap.zh_CN DELETED ---


--- FAPIcidfmap.zh_TW DELETED ---


--- cidfmap.zh_CN DELETED ---


--- cidfmap.zh_TW DELETED ---

More information about the fedora-extras-commits mailing list