Attachment 176161 Details for Bug 253813 – cjkunifonts.spec-2.patch

[patch] cjkunifonts.spec-2.patch

cjkunifonts.spec-2.patch (text/plain), 5.93 KB, created by Jens Petersen on 2007-08-28 12:44:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2007-08-28 12:44:49 UTC

Size: 5.93 KB

patch

obsolete

>diff -u cjkunifonts.spec\~ cjkunifonts.spec
>--- cjkunifonts.spec~	2007-07-13 11:50:33.000000000 +1000
>+++ cjkunifonts.spec	2007-08-28 22:39:20.000000000 +1000
>@@ -3,19 +3,16 @@
> %define cidmapdir      %{_sysconfdir}/ghostscript
> %define catalogue      /etc/X11/fontpath.d
> 
>-%define ver 0.1
>-%define minor 20060928
>-
> Name:         cjkunifonts
>-Version:      %{ver}.%{minor}
>+Version:      0.1.20060928
> Release:      1%{?dist}
>-Summary:      Chinese TrueType Font -- Simplified and Traditional Chinese Ming and Kai Face.
>-License:      Arphic Public License (GPL-like)
>+Summary:      Chinese TrueType Fonts -- Simplified and Traditional Chinese Ming and Kai Face
>+License:      Arphic
> Group:        User Interface/X
> URL:          http://www.freedesktop.org/wiki/Software/CJKUnifonts
> 
>-Source1:    http://ftp.debian.org/debian/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_%{ver}.%{minor}.orig.tar.gz
>-Source2:    http://ftp.debian.org/debian/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_%{ver}.%{minor}.orig.tar.gz
>+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
>@@ -29,7 +26,6 @@
> BuildArch:           noarch
> BuildRoot:           %{_tmppath}/%{name}-%{version}-root
> 
>-
> %description
> Chinese Unicode TrueType fonts derived from the original fonts generously made
> available by Arphic Technology under the "Arphic Public License" and extended
>@@ -40,26 +36,26 @@
> Summary:      Chinese Uming style face TrueType Font
> License:      Arphic Public License (GPL-like)
> Group:        User Interface/X
>-Conflicts:    fonts-chinese <= 3.03-9
>-Provides:     fonts-chinese = 3.03-9
>+Conflicts:    fonts-chinese <= 3.03-9.fc8
> Obsoletes:    ttfonts-zh_CN ttfonts-zh_TW
> 
> %description uming
> Chinese Uming style face TrueType Font derived from the original fonts released
> by Arphic Technology and extended by the CJK Unifonts project.
> 
>+
> %package ukai
>-Summary:      Chinese Ukai style face TrueType Font
>+Summary:      Chinese Ukai style face TrueType font
> License:      Arphic Public License (GPL-like)
> Group:        User Interface/X
>-Conflicts:    fonts-chinese <= 3.03-9
>-Provides:     fonts-chinese = 3.03-9
>+Conflicts:    fonts-chinese <= 3.03-9.fc8
> Obsoletes:    ttfonts-zh_CN ttfonts-zh_TW
> 
> %description ukai
> Chinese Ukai style face TrueType Font derived from the original fonts released
> by Arphic Technology and extended by the CJK Unifonts project.
> 
>+
> %prep
> %setup -q -T -c -a1 -a2
> 
>@@ -67,6 +63,7 @@
> %build
> %{nil}
> 
>+
> %install
> rm -rf $RPM_BUILD_ROOT
> install -d $RPM_BUILD_ROOT%{catalogue}
>@@ -82,8 +79,8 @@
> 
> install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType
> install -d $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType
>-ln -sf ../../%{name}-uming/uming.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf || :
>-ln -sf ../../%{name}-uming/uming.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf || :
>+ln -sf ../../%{name}-uming/uming.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
>+ln -sf ../../%{name}-uming/uming.ttf $RPM_BUILD_ROOT%{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
> 
> ln -sf %{umingfontdir} $RPM_BUILD_ROOT%{catalogue}/%{name}-uming
> 
>@@ -109,58 +106,42 @@
> install -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{cidmapdir}/
> install -m 0644 %{SOURCE8} $RPM_BUILD_ROOT%{cidmapdir}/
> 
>-
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
>-
> %post uming
>-if [ "$1" = 0 ];
>-then
>-    umask 133
>-
>-    if [ -x %{_bindir}/fc-cache ]; then
>-        %{_bindir}/fc-cache -s %{umingfontdir}
>-    fi
>+umask 133
>+if [ -x %{_bindir}/fc-cache ]; then
>+    %{_bindir}/fc-cache %{umingfontdir}
> fi
> 
>-
> %post ukai
>-if [ "$1" = 0 ];
>-then
>-    umask 133
>-
>-    if [ -x %{_bindir}/fc-cache ]; then
>-        %{_bindir}/fc-cache -s %{ukaifontdir}
>-    fi
>+umask 133
>+if [ -x %{_bindir}/fc-cache ]; then
>+    %{_bindir}/fc-cache %{ukaifontdir}
> fi
> 
>-
> %postun uming
>-if [ "$1" = 0 ];
>-then
>+if [ "$1" = 0 ]; then
>     umask 133
>-
>     if [ -x %{_bindir}/fc-cache ]; then
>-        %{_bindir}/fc-cache -s %{umingfontdir}
>+        %{_bindir}/fc-cache %{_datadir}/fonts
>     fi
> fi
> 
> 
> %postun ukai
>-if [ "$1" = 0 ];
>-then
>+if [ "$1" = 0 ]; then
>     umask 133
>-
>     if [ -x %{_bindir}/fc-cache ]; then
>-        %{_bindir}/fc-cache -s %{ukaifontdir}
>+        %{_bindir}/fc-cache %{_datadir}/fonts
>     fi
> fi
> 
> 
> %files uming
>-%defattr(-, root, root)
>-%doc ttf-arphic-uming-%{ver}.%{minor}/license
>+%defattr(-,root,root,-)
>+%doc ttf-arphic-uming-%{version}/license
> %dir %{umingfontdir}
> %dir %{cidmapdir}
> %dir %{_datadir}/fonts/zh_CN
>@@ -174,16 +155,16 @@
> %{cidmapdir}/cidfmap.zh_CN
> %{cidmapdir}/CIDFnmap.zh_TW
> %{cidmapdir}/CIDFnmap.zh_CN
>-%ghost %verify(not md5 size mtime) %{umingfontdir}/fonts.dir
>-%ghost %verify(not md5 size mtime) %{umingfontdir}/fonts.scale
>+%verify(not md5 size mtime) %{umingfontdir}/fonts.dir
>+%verify(not md5 size mtime) %{umingfontdir}/fonts.scale
> %ghost %verify(not md5 size mtime) %{_datadir}/fonts/zh_CN/TrueType/zysong.ttf
> %ghost %verify(not md5 size mtime) %{_datadir}/fonts/zh_TW/TrueType/bsmi00lp.ttf
> %{catalogue}/%{name}-uming
> 
> 
> %files ukai
>-%defattr(-, root, root)
>-%doc ttf-arphic-ukai-%{ver}.%{minor}/license
>+%defattr(-,root,root,-)
>+%doc ttf-arphic-ukai-%{version}/license
> %dir %{ukaifontdir}
> %dir %{cidmapdir}
> %dir %{_datadir}/fonts/zh_CN
>@@ -197,11 +178,10 @@
> %{cidmapdir}/cidfmap.zh_CN
> %{cidmapdir}/CIDFnmap.zh_TW
> %{cidmapdir}/CIDFnmap.zh_CN
>-%ghost %verify(not md5 size mtime) %{ukaifontdir}/fonts.dir
>-%ghost %verify(not md5 size mtime) %{ukaifontdir}/fonts.scale
>+%verify(not md5 size mtime) %{ukaifontdir}/fonts.dir
>+%verify(not md5 size mtime) %{ukaifontdir}/fonts.scale
> %{catalogue}/%{name}-ukai
> 
>-
> %changelog
> * Wed Aug 22 2007 Caius Chance <cchance@redhat.com> - 0.1.20060928-1.fc8
> - Resolved: rhbz#253813 (New package separated from fonts-chinese)
>
>Diff finished.  Tue Aug 28 22:39:37 2007

Actions: View | Diff

Attachments on bug 253813: 173401 | 176161 | 177821 | 177961 | 180241