Attachment 180321 Details for Bug 266281 – fonts-chinese.spec-1.patch

[patch] fonts-chinese.spec-1.patch

fonts-chinese.spec-1.patch (text/plain), 3.28 KB, created by Jens Petersen on 2007-08-30 08:09:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2007-08-30 08:09:15 UTC

Size: 3.28 KB

patch

obsolete

>diff -u fonts-chinese.spec\~ fonts-chinese.spec
>--- fonts-chinese.spec~	2007-08-30 17:32:36.000000000 +1000
>+++ fonts-chinese.spec	2007-08-30 18:05:48.000000000 +1000
>@@ -1,9 +1,10 @@
> %define basefontdir    %{_datadir}/fonts/chinese
> %define miscfontdir    %{basefontdir}/misc
>+%define catalogue      /etc/X11/fontpath.d
> 
> %define taipeiver 1.2
> 
>-Summary:      Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
>+Summary:     Traditional Chinese bitmap fonts and meta-package for Chinese fonts
> Name:         fonts-chinese
> Version:      3.03
> Release:      11%{?dist}
>@@ -15,13 +16,13 @@
> Source1:     taipeifonts-%{taipeiver}.tar.gz
> Source2:     taipeifonts.alias
> 
>-Requires(post):      ttmkfdir >= 3.0.6, xorg-x11-font-utils, fontconfig
>-Requires(postun):    fontconfig
> BuildRequires:       xorg-x11-font-utils
>-Obsoletes:           ttfonts-zh_CN ttfonts-zh_TW ttf-moe_sung ttf-moe_kai ttf-arphic_bming ttf-arphic_bkai taipeifonts
>+Obsoletes:           ttfonts-zh_CN <= 2.14-10, ttfonts-zh_TW <= 2.11-28, ttf-moe_sung, ttf-moe_kai, ttf-arphic_bming, ttf-arphic_bkai, taipeifonts
>+Requires:            cjkunifonts-uming, cjkunifonts-ukai
> 
> %description
>-Chinese bitmap fonts by Firefly.
>+This package includes some Traditional Chinese bitmap fonts and also acts
>+as a meta-package for general Chinese fonts support.
> 
> %prep
> %setup -q -T -c -a1
>@@ -43,41 +44,39 @@
> install -m 0644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
> install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
> 
>+# for catalogue
>+install -d $RPM_BUILD_ROOT%{catalogue}
>+ln -s %{miscfontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-chinese
>+
> # for fonts.*
>-#touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
>-#touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
>-#touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.dir
>-#touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.scale
>-
>-# for fonts.{dir,scale}
>-umask 133
>-touch $RPM_BUILD_ROOT%{miscfontdir} 2> /dev/null && {
>-    %{_bindir}/ttmkfdir -d $RPM_BUILD_ROOT%{miscfontdir} -o $RPM_BUILD_ROOT%{miscfontdir}/fonts.scale
>-    mkfontdir $RPM_BUILD_ROOT%{miscfontdir}
>-}
>+mkfontdir $RPM_BUILD_ROOT%{miscfontdir}
>+
>+touch $RPM_BUILD_ROOT%{basefontdir}/fonts.cache-1
>+touch $RPM_BUILD_ROOT%{miscfontdir}/fonts.cache-1
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>-%post
>-%{nil}
>-
>-%postun
>-%{nil}
>-
> %files
> %defattr(-, root, root)
> %dir %{basefontdir}
> %dir %{miscfontdir}
> %{miscfontdir}/*.gz
> %{miscfontdir}/fonts.alias
>+%ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
> %verify(not md5 size mtime) %{miscfontdir}/fonts.dir
>-%verify(not md5 size mtime) %{miscfontdir}/fonts.scale
>+%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1
>+%{catalogue}/fonts-chinese
> 
> %changelog
> * Thu Aug 30 2007 Caius Chance <cchance@redhat.com> - 3.03-11.fc8
> - Resolves: rhbz#266281 (Remove uming and ukai from fonts-chinese.)
>--- Removed fontconfig relevant contents from .spec file.
>+
>+* Thu Aug 30 2007 Jens Petersen <petersen@redhat.com>
>+- update summary and description
>+- drop scriptlets and their requires
>+- require new cjkunifonts-uming and cjkunifonts-ukai
>+- run mkfontdir at buildtime
> 
> * Thu Aug 30 2007 Caius Chance <cchance@redhat.com> - 3.03-10.fc8
> - Resolves: rhbz#266281 (Remove uming and ukai from fonts-chinese.)
>
>Diff finished.  Thu Aug 30 18:06:04 2007

Actions: View | Diff

Attachments on bug 266281: 180321