rpms/cjkuni-fonts/F-13 .cvsignore, 1.3, 1.4 cjkuni-fonts.spec, 1.24, 1.25 sources, 1.3, 1.4 cjkuni-fonts-0.2.20080216.1-18.patch, 1.1, NONE cjkuni-fonts-0.2.20080216.1-19.patch, 1.1, NONE cjkuni-fonts-uming-use-latin.patch, 1.1, NONE cjkunifonts-0.2.20080216.1-2.patch, 1.1, NONE

[Peng Wu]

Author: pwu

Update of /cvs/pkgs/rpms/cjkuni-fonts/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18037

Modified Files:
	.cvsignore cjkuni-fonts.spec sources 
Removed Files:
	cjkuni-fonts-0.2.20080216.1-18.patch 
	cjkuni-fonts-0.2.20080216.1-19.patch 
	cjkuni-fonts-uming-use-latin.patch 
	cjkunifonts-0.2.20080216.1-2.patch 
Log Message:
* Wed May 26 2010  Peng Wu <pwu at redhat.com> - 0.2.20080216.1-41
- Import from devel.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	22 Oct 2009 01:28:51 -0000	1.3
+++ .cvsignore	26 May 2010 07:09:42 -0000	1.4
@@ -1,3 +1,4 @@
 ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz
 ttf-arphic-uming_0.2.20080216.1.orig.tar.gz
 cjkuni-fonts-gscid-0.1.tgz
+ttf-arphic-fontconfig.tar.gz


Index: cjkuni-fonts.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/F-13/cjkuni-fonts.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- cjkuni-fonts.spec	24 May 2010 06:42:17 -0000	1.24
+++ cjkuni-fonts.spec	26 May 2010 07:09:43 -0000	1.25
@@ -14,6 +14,8 @@ the CJK Unifonts project.
 %define ukaibuilddir     %{fontname}-ukai-fonts-%{version}
 %define gsbuilddir       %{fontname}-fonts-gscid-0.1
 
+%define fcbuilddir       %{fontname}-fontconfig
+
 %define cncompatdir      %{_datadir}/fonts/zh_CN/TrueType
 %define twcompatdir      %{_datadir}/fonts/zh_TW/TrueType
 
@@ -23,7 +25,7 @@ the CJK Unifonts project.
 
 Name:        %{fontname}-fonts
 Version:     0.2.20080216.1
-Release:     38%{?dist}
+Release:     41%{?dist}
 Summary:     Chinese Unicode TrueType fonts in Ming and Kai face
 License:     Arphic
 Group:       User Interface/X
@@ -32,10 +34,7 @@ URL:         http://www.freedesktop.org/
 Source1:    http://ftp.debian.org/debian/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_%{version}.orig.tar.gz
 Source2:    http://ftp.debian.org/debian/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_%{version}.orig.tar.gz
 Source3:    cjkuni-fonts-gscid-0.1.tgz
-Patch1:     cjkunifonts-0.2.20080216.1-2.patch
-Patch2:     cjkuni-fonts-0.2.20080216.1-18.patch
-Patch3:     cjkuni-fonts-0.2.20080216.1-19.patch
-Patch4:     cjkuni-fonts-uming-use-latin.patch
+Source5:    ttf-arphic-fontconfig.tar.gz
 
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildArch:        noarch
@@ -47,7 +46,6 @@ BuildRequires:    fontpackages-devel >= 
 %package -n %{fontname}-uming-fonts
 Summary:      Chinese Unicode TrueType font in Ming face
 Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
 Obsoletes:    cjkunifonts-uming < 0.2.20080216.1-16
 
 %description -n %{fontname}-uming-fonts
@@ -78,7 +76,6 @@ CJK Unifonts in Ming face.
 %package -n %{fontname}-ukai-fonts
 Summary:      Chinese Unicode TrueType font in Kai face
 Group:        User Interface/X
-Requires:     %{fontname}-fonts-common = %{version}-%{release}
 Obsoletes:    cjkunifonts-ukai < 0.2.20080216.1-16
 
 %description -n %{fontname}-ukai-fonts
@@ -130,12 +127,9 @@ CJK Unifonts ghostscript files.
 
 %prep
 %setup -q -c -T -a1 -n %{umingbuilddir}
-%patch1 -p1 -b .1-rhbz466667
-%patch2 -p1 -b .2-rhbz475743
-%patch3 -p1 -b .3-rhbz459680
-%patch4 -p0 -b .4-use-latin
 %setup -q -c -T -a2 -n %{ukaibuilddir}
 %setup -q -c -T -a3 -n %{gsbuilddir}
+%setup -q -c -T -a5 -n %{fcbuilddir}
 
 %build
 %{nil}
@@ -161,26 +155,14 @@ cd ../
 %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir}
 %__install -m 0755 -d %{buildroot}%{_fontconfig_confdir}
 
-cd %{umingbuilddir}
-for fconf in `ls *-ttf-arphic-uming*.conf`
+pushd %{fcbuilddir}
+for fconf in `ls *-ttf-arphic*.conf`
 do
     %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
     %__ln_s %{_fontconfig_templatedir}/$fconf \
         %{buildroot}%{_fontconfig_confdir}/$fconf
 done
-cd ../
-
-cd %{ukaibuilddir}
-for fconf in `ls *-ttf-arphic-ukai*.conf`
-do
-    %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/
-    %__ln_s %{_fontconfig_templatedir}/$fconf \
-        %{buildroot}%{_fontconfig_confdir}/$fconf
-done
-cd ../
-
-# drop small bitmap rendering for now
-%__rm %{buildroot}%{_fontconfig_confdir}/25-ttf-arphic-uming-bitmaps.conf
+popd
 
 # ghostscript
 cd %{gsbuilddir}
@@ -202,6 +184,16 @@ cd ../
 %__rm -fr %{buildroot}
 
 %changelog
+* Wed May 26 2010  Peng Wu <pwu at redhat.com> - 0.2.20080216.1-41
+- Clean up rpm spec file and remove unused patches.
+
+* Wed May 26 2010  Peng Wu <pwu at redhat.com> - 0.2.20080216.1-40
+- Improves Simplified Chinese and Traditional Chinese fonts.
+  Resolves [rhbz#589974] cjkuni-uming-fonts .conf file breaks font lookup by lang
+
+* Wed May 26 2010  Peng Wu <pwu at redhat.com> - 0.2.20080216.1-39
+- Resolves [rhbz#595677] New: Dependency issue with upgrade in 37 -> 38.
+
 * Mon May 24 2010 Caius 'kaio' Chance <me at kaio.net> - 0.2.20080216.1-38
 - Resolve directory ownerships.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cjkuni-fonts/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	22 Oct 2009 01:28:51 -0000	1.3
+++ sources	26 May 2010 07:09:43 -0000	1.4
@@ -1,3 +1,4 @@
 4d3beb55db000bfedd18c9c7d6e631d8  ttf-arphic-ukai_0.2.20080216.1.orig.tar.gz
 d219fcaf953f3eb1889399955a00379f  ttf-arphic-uming_0.2.20080216.1.orig.tar.gz
 003dd4b7da513993dd43b01157cdd410  cjkuni-fonts-gscid-0.1.tgz
+53441256f113cce198f569a13a6fcbfa  ttf-arphic-fontconfig.tar.gz


--- cjkuni-fonts-0.2.20080216.1-18.patch DELETED ---


--- cjkuni-fonts-0.2.20080216.1-19.patch DELETED ---


--- cjkuni-fonts-uming-use-latin.patch DELETED ---


--- cjkunifonts-0.2.20080216.1-2.patch DELETED ---