rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.12,1.13

cchance cchance at fedoraproject.org
Mon Sep 21 04:37:08 UTC 2009 

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20366

Modified Files:
	cjkuni-fonts.spec 
Log Message:
* Mon Sep 21 2009 Caius kaio Chance <k at kaio.me> - 0.2.20080216.1-27.fc12
- Merged from F-11 tree.
- Obsoleted cjkuni-fonts-common.
- Resolves: rhbz#507637 (using font.{dir,scale} from upstream source)



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cjkuni-fonts.spec	24 Jul 2009 18:59:15 -0000	1.12
+++ cjkuni-fonts.spec	21 Sep 2009 04:37:07 -0000	1.13
@@ -4,21 +4,25 @@ CJK Unifonts are Unicode TrueType fonts 
 available by Arphic Technology under "Arphic Public License" and extended by \
 the CJK Unifonts project.
 
-%define gsdir           %{_datadir}/ghostscript/conf.d
-%define catalogue       %{_sysconfdir}/X11/fontpath.d
+%define umingdir         %{_datadir}/fonts/cjkuni-uming
+%define ukaidir          %{_datadir}/fonts/cjkuni-ukai
 
-%define umingbuilddir   %{fontname}-uming-fonts-%{version}
-%define ukaibuilddir    %{fontname}-ukai-fonts-%{version}
+%define gsdir            %{_datadir}/ghostscript/conf.d
+%define catalogue        %{_sysconfdir}/X11/fontpath.d
 
-%define _cncompatdir     %{_datadir}/fonts/zh_CN
-%define _twcompatdir     %{_datadir}/fonts/zh_TW
-%define cncompatdir      %{_cncompatdir}/TrueType
-%define twcompatdir      %{_twcompatdir}/TrueType
+%define umingbuilddir    %{fontname}-uming-fonts-%{version}
+%define ukaibuilddir     %{fontname}-ukai-fonts-%{version}
 
+%define cncompatdir      %{_datadir}/fonts/zh_CN/TrueType
+%define twcompatdir      %{_datadir}/fonts/zh_TW/TrueType
+
+%define _transdir        %{_datadir}/fonts/cjkunifonts-
+%define umingtransdir    %{_transdir}uming
+%define ukaitransdir     %{_transdir}ukai
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     26%{?dist}
+Release:     27%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -46,7 +50,7 @@ BuildRequires:    fontpackages-devel >= 
 %package -n %{fontname}-uming-fonts
 Summary:      Chinese Unicode TrueType font in Ming face.
 Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
+Obsoletes:    %{fontname}-fonts-common
 Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
@@ -54,9 +58,7 @@ Obsoletes:    cjkunifonts-uming < 0.2.20
 
 CJK Unifonts in Ming face.
 
-%_font_pkg -n uming -f *-ttf-arphic-uming*.conf uming.ttc
-
-# remaining uming files
+%files -n %{fontname}-uming-fonts
 %doc ../%{umingbuilddir}/license
 %doc ../%{umingbuilddir}/CONTRIBUTERS
 %doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
@@ -67,11 +69,21 @@ CJK Unifonts in Ming face.
 %doc ../%{umingbuilddir}/NEWS
 %doc ../%{umingbuilddir}/README
 %doc ../%{umingbuilddir}/TODO
+%dir %{umingdir}
+%dir %{_fontconfig_templatedir}
+%dir %{_fontconfig_confdir}
+%dir %{catalogue}
+%{umingdir}/uming.ttc
+%{umingdir}/fonts.dir
+%{umingdir}/fonts.scale
+%{_fontconfig_templatedir}/*-ttf-arphic-uming*.conf
+%{_fontconfig_confdir}/*-ttf-arphic-uming*.conf
+%{catalogue}/%{name}-uming
 
 %package -n %{fontname}-ukai-fonts
 Summary:      Chinese Unicode TrueType font in Kai face.
 Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
+Obsoletes:    %{fontname}-fonts-common
 Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
@@ -79,9 +91,7 @@ Obsoletes:    cjkunifonts-ukai < 0.2.200
 
 CJK Unifonts in Kai face.
 
-%_font_pkg -n ukai -f *-ttf-arphic-ukai*.conf ukai.ttc
-
-# remaining ukai files
+%files -n %{fontname}-ukai-fonts
 %doc ../%{ukaibuilddir}/license
 %doc ../%{ukaibuilddir}/CONTRIBUTERS
 %doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
@@ -92,6 +102,16 @@ CJK Unifonts in Kai face.
 %doc ../%{ukaibuilddir}/NEWS
 %doc ../%{ukaibuilddir}/README
 %doc ../%{ukaibuilddir}/TODO
+%dir %{ukaidir}
+%dir %{_fontconfig_templatedir}
+%dir %{_fontconfig_confdir}
+%dir %{catalogue}
+%{ukaidir}/ukai.ttc
+%{ukaidir}/fonts.dir
+%{ukaidir}/fonts.scale
+%{_fontconfig_templatedir}/*-ttf-arphic-ukai*.conf
+%{_fontconfig_confdir}/*-ttf-arphic-ukai*.conf
+%{catalogue}/%{name}-ukai
 
 %package -n %{fontname}-fonts-ghostscript
 Summary:      Chinese Unicode TrueType font ghostscript files.
@@ -101,7 +121,7 @@ Requires:     ghostscript >= 8.63-4
 Requires:     %{fontname}-uming-fonts = %{version}-%{release}
 Requires:     %{fontname}-ukai-fonts = %{version}-%{release}
 Conflicts:    cjkuni-fonts-common <= 0.2.20080216.1-19
-Obsoletes:    cjkuni-fonts-common < 0.2.20080216.1-20 
+Obsoletes:    cjkuni-fonts-common
 
 %description -n %{fontname}-fonts-ghostscript
 %common_desc
@@ -110,6 +130,7 @@ CJK Unifonts ghostscript files.
 
 %files -n %{fontname}-fonts-ghostscript
 %defattr(0644,root,root,0755)
+%dir %{gsdir}
 %{gsdir}/FAPIcidfmap.zh_TW
 %{gsdir}/FAPIcidfmap.zh_CN
 %{gsdir}/cidfmap.zh_TW
@@ -117,33 +138,6 @@ CJK Unifonts ghostscript files.
 %{gsdir}/CIDFnmap.zh_TW
 %{gsdir}/CIDFnmap.zh_CN
 
-%package -n %{fontname}-fonts-common
-Summary:      Chinese Unicode TrueType font common files.
-Group:        User Interface/X
-Requires:     fontpackages-filesystem >= 1.13
-Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    fonts-chinese < 3.03-13
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
-Obsoletes:    cjkunifonts-common < 0.2.20080216.1-16 
-
-%description -n %{fontname}-fonts-common
-%common_desc
-
-CJK Unifonts common files.
-
-%files -n %{fontname}-fonts-common
-%defattr(0644,root,root,0755)
-%dir %{_fontdir}
-%{gsdir}/FAPIcidfmap.zh_TW
-%{gsdir}/FAPIcidfmap.zh_CN
-%{gsdir}/cidfmap.zh_TW
-%{gsdir}/cidfmap.zh_CN
-%{gsdir}/CIDFnmap.zh_TW
-%{gsdir}/CIDFnmap.zh_CN
-%verify(not md5 size mtime) %{_fontdir}/fonts.dir
-%verify(not md5 size mtime) %{_fontdir}/fonts.scale
-%{catalogue}/%{name}
-
 %package -n %{fontname}-fonts-compat
 Summary:      Chinese Unicode TrueType font compatibility files.
 Group:        User Interface/X
@@ -157,12 +151,12 @@ CJK Unifonts compatibility files.
 
 %files -n %{fontname}-fonts-compat
 %defattr(0644,root,root,0755)
-%dir %{_cncompatdir}
-%dir %{_twcompatdir}
 %dir %{cncompatdir}
 %dir %{twcompatdir}
-%verify(not md5 size mtime) %{cncompatdir}/zysong.ttf
-%verify(not md5 size mtime) %{twcompatdir}/bsmi00lp.ttf
+%{cncompatdir}/zysong.ttf
+%{twcompatdir}/bsmi00lp.ttf
+%{umingtransdir}
+%{ukaitransdir}
 
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
@@ -177,15 +171,27 @@ CJK Unifonts compatibility files.
 %install
 %__rm -rf %{buildroot}
 
-# *.ttc(ttf)
-%__install -m 0755 -d %{buildroot}%{_fontdir}
-%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{_fontdir}/
-%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{_fontdir}/
-
-# fonts.{scale,dir}
-%{_bindir}/ttmkfdir -d %{buildroot}%{_fontdir} \
-    -o %{buildroot}%{_fontdir}/fonts.scale
-%{_bindir}/mkfontdir %{buildroot}%{_fontdir}
+# *.ttc(ttf) and font.{dir,scale}
+%__install -m 0755 -d %{buildroot}%{umingdir}
+%__install -m 0755 -d %{buildroot}%{ukaidir}
+%__install -m 0644 ../%{umingbuilddir}/uming.ttc %{buildroot}%{umingdir}/
+%__install -m 0644 ../%{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaidir}/
+
+# fonts.{scale,dir} # use upstream included one instead
+%__install -m 0644 ../%{umingbuilddir}/fonts.dir %{buildroot}%{umingdir}/
+%__install -m 0644 ../%{umingbuilddir}/fonts.scale %{buildroot}%{umingdir}/
+%__install -m 0644 ../%{ukaibuilddir}/fonts.dir %{buildroot}%{ukaidir}/
+%__install -m 0644 ../%{ukaibuilddir}/fonts.scale %{buildroot}%{ukaidir}/
+#cd %{buildroot}%{umingdir}
+#%{_bindir}/ttmkfdir -d %{buildroot}%{umingdir} \
+#    -o %{buildroot}%{umingdir}/fonts.scale
+#%{_bindir}/mkfontdir %{buildroot}%{umingdir}
+#cd -
+#cd %{buildroot}%{ukaidir}
+#%{_bindir}/ttmkfdir -d %{buildroot}%{ukaidir} \
+#    -o %{buildroot}%{ukaidir}/fonts.scale
+#%{_bindir}/mkfontdir %{buildroot}%{ukaidir}
+#cd -
 
 # *.conf
 %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
@@ -217,18 +223,28 @@ cd -
 
 # catalogue
 %__install -m 0755 -d %{buildroot}%{catalogue}
-%__ln_s %{_fontdir} %{buildroot}%{catalogue}/%{name}
+%__ln_s %{umingdir} %{buildroot}%{catalogue}/%{name}-uming
+%__ln_s %{ukaidir} %{buildroot}%{catalogue}/%{name}-ukai
 
 # backward compat to obsoleted ttf
 %__install -m 0755 -d %{buildroot}%{cncompatdir}
 %__install -m 0755 -d %{buildroot}%{twcompatdir}
-%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
-%__ln_s %{_fontdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
+%__ln_s %{umingdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
+%__ln_s %{umingdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
+
+# backward compt to transition dir
+%__ln_s %{umingdir}/ %{buildroot}%{umingtransdir}
+%__ln_s %{ukaidir}/ %{buildroot}%{ukaitransdir}
 
 %clean
 %__rm -fr %{buildroot}
 
 %changelog
+* Mon Sep 21 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-27.fc12
+- Merged from F-11 tree.
+- Obsoleted cjkuni-fonts-common.
+- Resolves: rhbz#507637 (using font.{dir,scale} from upstream source)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.20080216.1-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

More information about the fonts-bugs mailing list