rpms/cjkuni-fonts/F-11 cjkuni-fonts.spec,1.11,1.12

Fri Jun 26 05:18:01 UTC 2009

Author: cchance

Update of /cvs/pkgs/rpms/cjkuni-fonts/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32000

Modified Files:
	cjkuni-fonts.spec 
Log Message:
refined .spec before rebuild


Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/F-11/cjkuni-fonts.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12

--- cjkuni-fonts.spec	26 Jun 2009 03:50:20 -0000	1.11
+++ cjkuni-fonts.spec	26 Jun 2009 05:17:30 -0000	1.12
@@ -4,19 +4,17 @@ CJK Unifonts are Unicode TrueType fonts 
 available by Arphic Technology under "Arphic Public License" and extended by \
 the CJK Unifonts project.
 
+%define umingdir         %{_datadir}/fonts/cjkuni-uming
+%define ukaidir          %{_datadir}/fonts/cjkuni-ukai
+
 %define gsdir            %{_datadir}/ghostscript/conf.d
 %define catalogue        %{_sysconfdir}/X11/fontpath.d
 
 %define umingbuilddir    %{fontname}-uming-fonts-%{version}
 %define ukaibuilddir     %{fontname}-ukai-fonts-%{version}
 
-%define umingdir         %{_datadir}/fonts/cjkuni-uming
-%define ukaidir          %{_datadir}/fonts/cjkuni-ukai
-
-%define _cncompatdir     %{_datadir}/fonts/zh_CN
-%define _twcompatdir     %{_datadir}/fonts/zh_TW
-%define cncompatdir      %{_cncompatdir}/TrueType
-%define twcompatdir      %{_twcompatdir}/TrueType
+%define cncompatdir      %{_datadir}/fonts/zh_CN/TrueType
+%define twcompatdir      %{_datadir}/fonts/zh_TW/TrueType
 
 %define _transdir        %{_datadir}/fonts/cjkunifonts-
 %define umingtransdir    %{_transdir}uming
@@ -52,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}-uming-fonts-common = %{version}-%{release}
+Obsoletes:    %{fontname}-fonts-common < 0.2.20080216.1-25
 Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
@@ -74,14 +72,18 @@ CJK Unifonts in Ming face.
 %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
-%verify(not md5 size mtime) %{_fontconfig_confdir}/*-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}-ukai-fonts-common = %{version}-%{release}
+Obsoletes:    %{fontname}-fonts-common < 0.2.20080216.1-25
 Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
@@ -100,11 +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
-%verify(not md5 size mtime) %{_fontconfig_confdir}/*-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.
@@ -123,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
@@ -130,60 +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 %{catalogue}
-%verify(not md5 size mtime) %{catalogue}/%{name}-uming
-%verify(not md5 size mtime) %{catalogue}/%{name}-ukai
-
-%package -n %{fontname}-uming-fonts-common
-Summary:      Chinese Unicode TrueType font uming common files.
-Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
-Obsoletes:    cjkunifonts-common < 0.2.20080216.1-16 
-
-%description -n %{fontname}-uming-fonts-common
-%common_desc
-
-CJK Unifonts uming common files.
-
-%files -n %{fontname}-uming-fonts-common
-%defattr(0644,root,root,0755)
-%dir %{umingdir}
-%verify(not md5 size mtime) %{umingdir}/fonts.dir
-%verify(not md5 size mtime) %{umingdir}/fonts.scale
-
-%package -n %{fontname}-ukai-fonts-common
-Summary:      Chinese Unicode TrueType font ukai common files.
-Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
-Obsoletes:    cjkunifonts-common < 0.2.20080216.1-16 
-
-%description -n %{fontname}-ukai-fonts-common
-%common_desc
-
-CJK Unifonts ukai common files.
-
-%files -n %{fontname}-ukai-fonts-common
-%defattr(0644,root,root,0755)
-%dir %{ukaidir}
-%verify(not md5 size mtime) %{ukaidir}/fonts.dir
-%verify(not md5 size mtime) %{ukaidir}/fonts.scale
-
 %package -n %{fontname}-fonts-compat
 Summary:      Chinese Unicode TrueType font compatibility files.
 Group:        User Interface/X
@@ -197,20 +151,12 @@ CJK Unifonts compatibility files.
 
 %files -n %{fontname}-fonts-compat
 %defattr(0644,root,root,0755)
-%dir %{_cncompatdir}
-%dir %{_twcompatdir}
 %dir %{cncompatdir}
 %dir %{twcompatdir}
-%dir %{umingtransdir}
-%dir %{ukaitransdir}
-%verify(not md5 size mtime) %{cncompatdir}/zysong.ttf
-%verify(not md5 size mtime) %{twcompatdir}/bsmi00lp.ttf
-%verify(not md5 size mtime) %{umingtransdir}/uming.ttf
-%verify(not md5 size mtime) %{umingtransdir}/fonts.dir
-%verify(not md5 size mtime) %{umingtransdir}/fonts.scale
-%verify(not md5 size mtime) %{ukaitransdir}/ukai.ttf
-%verify(not md5 size mtime) %{ukaitransdir}/fonts.dir
-%verify(not md5 size mtime) %{ukaitransdir}/fonts.scale
+%{cncompatdir}/zysong.ttf
+%{twcompatdir}/bsmi00lp.ttf
+%{umingtransdir}
+%{ukaitransdir}
 
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
@@ -283,14 +229,8 @@ cd -
 %__ln_s %{umingdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
 
 # backward compt to transition dir
-%__install -m 0755 -d %{buildroot}%{umingtransdir}
-%__install -m 0755 -d %{buildroot}%{ukaitransdir}
-%__ln_s %{umingdir}/uming.ttc %{buildroot}%{umingtransdir}/uming.ttf
-%__ln_s %{umingdir}/fonts.dir %{buildroot}%{umingtransdir}/fonts.dir
-%__ln_s %{umingdir}/fonts.scale %{buildroot}%{umingtransdir}/fonts.scale
-%__ln_s %{ukaidir}/ukai.ttc  %{buildroot}%{ukaitransdir}/ukai.ttf
-%__ln_s %{ukaidir}/fonts.dir %{buildroot}%{ukaitransdir}/fonts.dir
-%__ln_s %{ukaidir}/fonts.scale %{buildroot}%{ukaitransdir}/fonts.scale
+%__ln_s %{umingdir}/ %{buildroot}%{umingtransdir}
+%__ln_s %{ukaidir}/ %{buildroot}%{ukaitransdir}
 
 %clean
 %__rm -fr %{buildroot}


