Author: cchance Update of /cvs/pkgs/rpms/cjkuni-fonts/devel In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21847
Modified Files: .cvsignore cjkuni-fonts.spec sources Log Message: * Thu Oct 22 2009 Caius kaio Chance <k at kaio.me> - 0.2.20080216.1-28.fc13 - Resolves: 529975 - Make ghostscript address to be dynamic generated. Index: .cvsignore =================================================================== RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- .cvsignore 21 Jan 2009 03:37:41 -0000 1.2 +++ .cvsignore 22 Oct 2009 01:28:51 -0000 1.3 @@ -1,2 +1,3 @@ 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 Index: cjkuni-fonts.spec =================================================================== RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/cjkuni-fonts.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- cjkuni-fonts.spec 21 Sep 2009 04:37:07 -0000 1.13 +++ cjkuni-fonts.spec 22 Oct 2009 01:28:51 -0000 1.14 @@ -12,6 +12,7 @@ the CJK Unifonts project. %define umingbuilddir %{fontname}-uming-fonts-%{version} %define ukaibuilddir %{fontname}-ukai-fonts-%{version} +%define gsbuilddir %{fontname}-fonts-gscid-0.1 %define cncompatdir %{_datadir}/fonts/zh_CN/TrueType %define twcompatdir %{_datadir}/fonts/zh_TW/TrueType @@ -22,7 +23,7 @@ the CJK Unifonts project. Name: %{fontname}-fonts Version: 0.2.20080216.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Chinese Unicode TrueType fonts in Ming and Kai face. License: Arphic Group: User Interface/X @@ -30,19 +31,14 @@ 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: FAPIcidfmap.zh_TW -Source4: FAPIcidfmap.zh_CN -Source5: cidfmap.zh_TW -Source6: cidfmap.zh_CN -Source7: CIDFnmap.zh_TW -Source8: CIDFnmap.zh_CN +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 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch -BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils, ttmkfdir +#BuildRequires: fontpackages-devel >= 1.13, xorg-x11-font-utils, ttmkfdir %description %common_desc @@ -164,6 +160,7 @@ CJK Unifonts compatibility files. %patch2 -p1 -b .2-rhbz475743 %patch3 -p1 -b .3-rhbz459680 %setup -q -c -T -a2 -n %{ukaibuilddir} +%setup -q -c -T -a3 -n %{gsbuilddir} %build %{nil} @@ -171,17 +168,20 @@ CJK Unifonts compatibility files. %install %__rm -rf %{buildroot} +cd ../ + # *.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}/ +%__install -m 0644 %{umingbuilddir}/uming.ttc %{buildroot}%{umingdir}/ +%__install -m 0644 %{ukaibuilddir}/ukai.ttc %{buildroot}%{ukaidir}/ # 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}/ +%__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 @@ -196,35 +196,40 @@ CJK Unifonts compatibility files. # *.conf %__install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %__install -m 0755 -d %{buildroot}%{_fontconfig_confdir} -cd ../%{umingbuilddir} + +cd %{umingbuilddir} for fconf in `ls *-ttf-arphic-uming*.conf` do %__install -m 0644 $fconf %{buildroot}%{_fontconfig_templatedir}/ %__ln_s %{_fontconfig_templatedir}/$fconf \ %{buildroot}%{_fontconfig_confdir}/$fconf done -cd ../%{ukaibuilddir} +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 - +cd ../ # ghostscript +cd %{gsbuilddir} %__install -m 0755 -d %{buildroot}%{gsdir} -%__install -m 0644 %{SOURCE3} %{buildroot}%{gsdir}/ -%__install -m 0644 %{SOURCE4} %{buildroot}%{gsdir}/ -%__install -m 0644 %{SOURCE5} %{buildroot}%{gsdir}/ -%__install -m 0644 %{SOURCE6} %{buildroot}%{gsdir}/ -%__install -m 0644 %{SOURCE7} %{buildroot}%{gsdir}/ -%__install -m 0644 %{SOURCE8} %{buildroot}%{gsdir}/ +for gscid in `ls` +do + cat $gscid | sed --expression='s/###ukailoc###/\/usr\/share\/fonts\/cjkuni-ukai/g' --expression='s/###umingloc###/\/usr\/share\/fonts\/cjkuni-uming/g' > tmp_gs + mv tmp_gs $gscid + %__install -m 0644 $gscid %{buildroot}%{gsdir} +done +cd ../ # catalogue %__install -m 0755 -d %{buildroot}%{catalogue} -%__ln_s %{umingdir} %{buildroot}%{catalogue}/%{name}-uming -%__ln_s %{ukaidir} %{buildroot}%{catalogue}/%{name}-ukai +%__ln_s %{umingdir}/ %{buildroot}%{catalogue}/%{name}-uming +%__ln_s %{ukaidir}/ %{buildroot}%{catalogue}/%{name}-ukai # backward compat to obsoleted ttf %__install -m 0755 -d %{buildroot}%{cncompatdir} @@ -240,6 +245,9 @@ cd - %__rm -fr %{buildroot} %changelog +* Thu Oct 22 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-28.fc13 +- Resolves: 529975 - Make ghostscript address to be dynamic generated. + * Mon Sep 21 2009 Caius 'kaio' Chance <k at kaio.me> - 0.2.20080216.1-27.fc12 - Merged from F-11 tree. - Obsoleted cjkuni-fonts-common. Index: sources =================================================================== RCS file: /cvs/pkgs/rpms/cjkuni-fonts/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- sources 21 Jan 2009 03:37:41 -0000 1.2 +++ sources 22 Oct 2009 01:28:51 -0000 1.3 @@ -1,2 +1,3 @@ 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 _______________________________________________ Fedora-fonts-bugs-list mailing list Fedora-fonts-bugs-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-fonts-bugs-list