rpms/cjkunifonts/devel .cvsignore, 1.2, 1.3 cjkunifonts.spec, 1.7, 1.8 sources, 1.2, 1.3

Tue Aug 5 04:48:56 UTC 2008

Author: cchance

Update of /cvs/pkgs/rpms/cjkunifonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27077

Modified Files:
	.cvsignore cjkunifonts.spec sources 
Log Message:
* Tue Aug 05 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-1.fc10
- Resolves: rhbz#123456 (Update latest release fro upstream.)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	31 Aug 2007 01:20:20 -0000	1.2
+++ .cvsignore	5 Aug 2008 04:48:26 -0000	1.3
@@ -1,2 +1,2 @@
-ttf-arphic-ukai_0.1.20060928.orig.tar.gz
-ttf-arphic-uming_0.1.20060928.orig.tar.gz
+ttf-arphic-uming_0.2.20080216.1.orig.tar.gz
+ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz


Index: cjkunifonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/cjkunifonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cjkunifonts.spec	30 Jun 2008 06:15:37 -0000	1.7
+++ cjkunifonts.spec	5 Aug 2008 04:48:26 -0000	1.8
@@ -1,11 +1,15 @@
 %define umingfontdir    %{_datadir}/fonts/%{name}-uming
 %define ukaifontdir     %{_datadir}/fonts/%{name}-ukai
+%define fcdir           %{_sysconfdir}/fonts/conf.d
 %define cidmapdir       %{_datadir}/ghostscript/conf.d
-%define catalogue       /etc/X11/fontpath.d
+%define catalogue       %{_sysconfdir}/X11/fontpath.d
+
+%define umingbuilddir   ../%{name}-uming-%{version}
+%define ukaibuilddir    ../%{name}-ukai-%{version}
 
 Name:        cjkunifonts
-Version:     0.1.20060928
-Release:     6%{?dist}
+Version:     0.2.20080216.1
+Release:     1%{?dist}
 Summary:     Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
 License:     Arphic
 Group:       User Interface/X
@@ -34,8 +38,8 @@
 License:      Arphic
 Group:        User Interface/X
 Conflicts:    fonts-chinese <= 3.03-9.fc8
-Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
 Obsoletes:    fonts-chinese < 3.03-13
+Obsoletes:    ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28
 
 %description uming
 Chinese Uming style face TrueType Font derived from the original fonts released
@@ -46,6 +50,7 @@
 License:      Arphic
 Group:        User Interface/X
 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
 
 %description ukai
@@ -53,7 +58,8 @@
 by Arphic Technology and extended by the CJK Unifonts project.
 
 %prep
-%setup -q -T -c -a1 -a2
+%setup -q -c -T -a1 -n %{name}-uming-%{version}
+%setup -q -c -T -a2 -n %{name}-ukai-%{version}
 
 %build
 %{nil}
@@ -67,8 +73,8 @@
 install -d $RPM_BUILD_ROOT%{ukaifontdir}
 
 # ttfs
-install -m 0644 ttf-arphic-uming-%{version}/uming.ttf $RPM_BUILD_ROOT%{umingfontdir}/
-install -m 0644 ttf-arphic-ukai-%{version}/ukai.ttf $RPM_BUILD_ROOT%{ukaifontdir}/
+install -m 0644 %{umingbuilddir}/uming.ttc $RPM_BUILD_ROOT%{umingfontdir}/
+install -m 0644 %{ukaibuilddir}/ukai.ttc $RPM_BUILD_ROOT%{ukaifontdir}/
 
 # fonts.{scale,dir}
 %{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{umingfontdir} -o $RPM_BUILD_ROOT%{umingfontdir}/fonts.scale
@@ -76,11 +82,16 @@
 %{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{ukaifontdir} -o $RPM_BUILD_ROOT%{ukaifontdir}/fonts.scale
 mkfontdir $RPM_BUILD_ROOT%{ukaifontdir}
 
+# fontconfig config files
+install -d $RPM_BUILD_ROOT%{fcdir}
+install -m 0644 %{umingbuilddir}/*.conf $RPM_BUILD_ROOT%{fcdir}/
+install -m 0644 %{ukaibuilddir}/*.conf $RPM_BUILD_ROOT%{fcdir}/
+
 # backward compat
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
 install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType
-ln -s ../../%{name}-uming/uming.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
-ln -s ../../%{name}-uming/uming.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
+ln -s ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
+ln -s ../../%{name}-uming/uming.ttc $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
 
 # catalogue
 ln -s %{umingfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-uming
@@ -128,13 +139,23 @@
 
 %files uming
 %defattr(-,root,root,-)
-%doc ttf-arphic-uming-%{version}/license
+%doc %{umingbuilddir}/license
+%doc %{umingbuilddir}/CONTRIBUTERS
+%doc %{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.odt
+%doc %{umingbuilddir}/Font_Comparison_ShanHeiSun_UMing.pdf
+%doc %{umingbuilddir}/FONTLOG
+%doc %{umingbuilddir}/INSTALL
+%doc %{umingbuilddir}/KNOWN_ISSUES
+%doc %{umingbuilddir}/NEWS
+%doc %{umingbuilddir}/README
+%doc %{umingbuilddir}/TODO
 %dir %{umingfontdir}
 %dir %{_datadir}/fonts/zh_CN
 %dir %{_datadir}/fonts/zh_TW
 %dir %{_datadir}/fonts/zh_CN/TrueType
 %dir %{_datadir}/fonts/zh_TW/TrueType
-%{umingfontdir}/*.ttf
+%{umingfontdir}/*.ttc
+%{fcdir}/*-ttf-arphic-uming*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -149,9 +170,19 @@
 
 %files ukai
 %defattr(-,root,root,-)
-%doc ttf-arphic-ukai-%{version}/license
+%doc %{ukaibuilddir}/license
+%doc %{ukaibuilddir}/CONTRIBUTERS
+%doc %{ukaibuilddir}/Font_Comparison_ZenKai_UKai.odt
+%doc %{ukaibuilddir}/Font_Comparison_ZenKai_UKai.pdf
+%doc %{ukaibuilddir}/FONTLOG
+%doc %{ukaibuilddir}/INSTALL
+%doc %{ukaibuilddir}/KNOWN_ISSUES
+%doc %{ukaibuilddir}/NEWS
+%doc %{ukaibuilddir}/README
+%doc %{ukaibuilddir}/TODO
 %dir %{ukaifontdir}
-%{ukaifontdir}/*.ttf
+%{ukaifontdir}/*.ttc
+%{fcdir}/*-ttf-arphic-ukai*.conf
 %{cidmapdir}/FAPIcidfmap.zh_TW
 %{cidmapdir}/FAPIcidfmap.zh_CN
 %{cidmapdir}/cidfmap.zh_TW
@@ -163,6 +194,9 @@
 %{catalogue}/%{name}-ukai
 
 %changelog
+* Tue Aug 05 2008 Caius Chance <cchance at redhat.com> - 0.2.20080216.1-1.fc10
+- Resolves: rhbz#123456 (Update latest release fro upstream.)
+
 * Mon Jun 30 2008 Caius Chance <cchance at redhat.com> - 0.1.20060928-6.fc10
 - Refined obsoletes of fonts-chinese to be more ver-rel specific.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cjkunifonts/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Aug 2007 01:20:20 -0000	1.2
+++ sources	5 Aug 2008 04:48:26 -0000	1.3
@@ -1,2 +1,2 @@
-465b1350911f086a2021c36e039f79c8  ttf-arphic-ukai_0.1.20060928.orig.tar.gz
-4f2e5a4ba4cf3ac01518ea211a89fdc1  ttf-arphic-uming_0.1.20060928.orig.tar.gz
+d219fcaf953f3eb1889399955a00379f  ttf-arphic-uming_0.2.20080216.1.orig.tar.gz
+4d3beb55db000bfedd18c9c7d6e631d8  ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz


