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

[Caius Chance]

Author: cchance

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

Modified Files:
	cjkuni-fonts.spec 
Log Message:
used upstream provided fonts.{dir,scale}



Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/F-11/cjkuni-fonts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cjkuni-fonts.spec	26 Jun 2009 05:17:30 -0000	1.12
+++ cjkuni-fonts.spec	28 Jun 2009 23:50:58 -0000	1.13
@@ -22,7 +22,7 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     25%{?dist}
+Release:     26%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face.
 License:     Arphic
 Group:       User Interface/X
@@ -171,23 +171,27 @@ CJK Unifonts compatibility files.
 %install
 %__rm -rf %{buildroot}
 
-# *.ttc(ttf)
+# *.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}
-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 -
+# 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}
@@ -236,8 +240,11 @@ cd -
 %__rm -fr %{buildroot}
 
 %changelog
+* Mon Jun 29 2009 Caius 'kaio' Chance <k AT kaio.me> - 0.2.20080216.1-26.fc11
+- Used upstream provided fonts.{dir,scale}.
+
 * Fri Jun 26 2009 Caius 'kaio' Chance <k AT kaio.me> - 0.2.20080216.1-25.fc11
-- Resolves: rhbz#507637 (Missing fontset info: fixed by subpackaged -common.)
+- Factorized spec file. (rh#507637)
 
 * Fri Jun 19 2009 Caius 'kaio' Chance <k AT kaio.me> - 0.2.20080216.1-24.fc11
 - Resolves: rhbz#468193 (Compatibility to previous installed location.)