rpms/wqy-microhei-fonts/devel wqy-microhei-fonts.spec,1.4,1.5

[Peng Wu]

Author: pwu

Update of /cvs/pkgs/rpms/wqy-microhei-fonts/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13821

Modified Files:
	wqy-microhei-fonts.spec 
Log Message:
* Mon May 31 2010  Peng Wu <pwu at redhat.com> - 0.2.0-0.6.beta
- Add fontconfig file back to wqy-microhei-fonts.




Index: wqy-microhei-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wqy-microhei-fonts/devel/wqy-microhei-fonts.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- wqy-microhei-fonts.spec	26 May 2010 06:37:33 -0000	1.4
+++ wqy-microhei-fonts.spec	31 May 2010 03:50:06 -0000	1.5
@@ -1,17 +1,18 @@
 %global fontname wqy-microhei
-#%global fontconf 65-%{fontname}.conf
+%global fontconf 65-%{fontname}.conf
 
 %global archivename %{fontname}-%{version}-beta
 
 Name:           %{fontname}-fonts
 Version:        0.2.0
-Release:        0.5.beta%{?dist}
+Release:        0.6.beta%{?dist}
 Summary:        Compact Chinese fonts derived from Droid
 
 Group:          User Interface/X
 License:        ASL 2.0 or GPLv3 with exceptions
 URL:            http://wenq.org/enindex.cgi?MicroHei(en)
 Source0:        http://downloads.sourceforge.net/wqy/%{archivename}.tar.gz
+Source1:        %{name}-fontconfig.conf
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildArch:      noarch
@@ -41,15 +42,24 @@ install -m 0644 -p *.ttc %{buildroot}%{_
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
 
+install -m 0644 -p %{SOURCE1} \
+        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
+ln -s %{_fontconfig_templatedir}/%{fontconf} \
+      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+
+
 %clean
 rm -fr %{buildroot}
 
 
-%_font_pkg *.ttc
+%_font_pkg -f %{fontconf} *.ttc
 %doc LICENSE_Apache2.txt LICENSE_GPLv3.txt README.txt
 
 
 %changelog
+* Mon May 31 2010  Peng Wu <pwu at redhat.com> - 0.2.0-0.6.beta
+- Add fontconfig file back to wqy-microhei-fonts.
+
 * Wed May 26 2010  Peng Wu <pwu at redhat.com> - 0.2.0-0.5.beta
 - Clean up rpm spec file and remove unused patches.