rpms/cjkuni-fonts/devel cjkuni-fonts.spec,1.17,1.18

[cchance]

Author: cchance

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

Modified Files:
	cjkuni-fonts.spec 
Log Message:
fixes to Mailhot's font audit



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- cjkuni-fonts.spec	11 Nov 2009 04:19:33 -0000	1.17
+++ cjkuni-fonts.spec	1 Dec 2009 07:13:53 -0000	1.18
@@ -23,8 +23,8 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     31%{?dist}
-Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
+Release:     32%{?dist}
+Summary:     Chinese Unicode TrueType fonts in Ming and Kai face
 License:     Arphic
 Group:       User Interface/X
 URL:         http://www.freedesktop.org/wiki/Software/CJKUnifonts
@@ -47,7 +47,7 @@ BuildRequires:    fontpackages-devel >= 
 %package -n %{fontname}-uming-fonts
 Summary:      Chinese Unicode TrueType font in Ming face.
 Group:        User Interface/X
-Obsoletes:    %{fontname}-fonts-common
+Obsoletes:    %{fontname}-fonts-common < 0.2.20080216.1-32
 Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
@@ -56,6 +56,7 @@ Obsoletes:    cjkunifonts-uming < 0.2.20
 CJK Unifonts in Ming face.
 
 %files -n %{fontname}-uming-fonts
+%defattr(0644,root,root,0755)
 %doc ../%{umingbuilddir}/license
 %doc ../%{umingbuilddir}/CONTRIBUTERS
 %doc ../%{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
@@ -80,7 +81,7 @@ CJK Unifonts in Ming face.
 %package -n %{fontname}-ukai-fonts
 Summary:      Chinese Unicode TrueType font in Kai face.
 Group:        User Interface/X
-Obsoletes:    %{fontname}-fonts-common
+Obsoletes:    %{fontname}-fonts-common < 0.2.20080216.1-32
 Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
@@ -89,6 +90,7 @@ Obsoletes:    cjkunifonts-ukai < 0.2.200
 CJK Unifonts in Kai face.
 
 %files -n %{fontname}-ukai-fonts
+%defattr(0644,root,root,0755)
 %doc ../%{ukaibuilddir}/license
 %doc ../%{ukaibuilddir}/CONTRIBUTERS
 %doc ../%{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
@@ -118,7 +120,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
+Obsoletes:    cjkuni-fonts-common < 0.2.20080216.1-32
 
 %description -n %{fontname}-fonts-ghostscript
 %common_desc
@@ -237,19 +239,25 @@ cd ../
 %__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 %{umingdir}/uming.ttc %{buildroot}%{cncompatdir}/zysong.ttf
-%__ln_s %{umingdir}/uming.ttc %{buildroot}%{twcompatdir}/bsmi00lp.ttf
+#%__install -m 0755 -d %{buildroot}%{cncompatdir}
+#%__install -m 0755 -d %{buildroot}%{twcompatdir}
+#%__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}
+#%__ln_s %{umingdir}/ %{buildroot}%{umingtransdir}
+#%__ln_s %{ukaidir}/ %{buildroot}%{ukaitransdir}
 
 %clean
 %__rm -fr %{buildroot}
 
 %changelog
+* Wed Dec 01 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-32
+- Mailhot's font audit:
+ - Add obsolete package versions.
+ - Add default attributes.
+ - Remove symlinks.
+
 * Wed Nov 11 2009 Peng Huang <shawn.p.huang at gmail.com> - 0.2.20080216.1-31
 - Use latin font to display common ascii in Chinese string