Attachment 204781 Details for Bug 253812 – taipeifonts.spec-1.patch

[patch] taipeifonts.spec-1.patch

taipeifonts.spec-1.patch (text/plain), 3.99 KB, created by Jens Petersen on 2007-09-25 02:42:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Petersen

Created: 2007-09-25 02:42:50 UTC

Size: 3.99 KB

patch

obsolete

>diff -u taipei-fonts.spec.orig taipeifonts.spec
>--- taipei-fonts.spec.orig	2007-09-25 11:14:16.000000000 +1000
>+++ taipeifonts.spec	2007-09-25 12:41:16.000000000 +1000
>@@ -1,84 +1,72 @@
>-%define basefontdir    %{_datadir}/fonts/chinese
>-%define miscfontdir    %{basefontdir}/misc
>-%define taipeiver      1.2
>-
>-Summary:      Chinese Bitmap Font.
>-Name:         taipei-fonts
>-Version:      0.1
>-Release:      1%{?dist}
>-License:      GPL
>+%define bmpfontdir    %{_datadir}/fonts/%{name}
>+
>+Name:         taipeifonts
>+Version:      1.2
>+Release:      2%{?dist}
>+Summary:      Chinese Bitmap Fonts
>+
> Group:        User Interface/X
>+License:      Public Domain
>+Source0:      taipeifonts-%{version}.tar.gz
>+Source1:      taipeifonts.alias
> BuildArch:    noarch
> BuildRoot:    %{_tmppath}/%{name}-%{version}-root
> 
>-Source1:     taipeifonts-%{taipeiver}.tar.gz
>-Source2:     taipeifonts.alias
>-
>-Requires(post):      xorg-x11-font-utils, fontconfig
>-Requires(postun):    fontconfig
>-BuildRequires:       xorg-x11-font-utils
>-Obsoletes:           taipeifonts
>+BuildRequires: xorg-x11-font-utils
> 
> %description
>-Chinese bitmap Fonts donated by bitmap by Firefly. Read license files for details.
>+Traditional Chinese bitmap fonts.
> 
> %prep
>-%setup -q -T -c -a1
>+%setup -q
> 
> %build
>-pushd taipeifonts-%{taipeiver}/
> bdftopcf taipei24.bdf | gzip -c > taipei24.pcf.gz
> bdftopcf taipei20.bdf | gzip -c > taipei20.pcf.gz
> bdftopcf taipei16.bdf | gzip -c > taipei16.pcf.gz
>-popd
> 
> %install
> rm -rf $RPM_BUILD_ROOT
> 
>-install -d $RPM_BUILD_ROOT%{miscfontdir}
>-install -m 0644 taipeifonts-%{taipeiver}/taipei24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
>-install -m 0644 taipeifonts-%{taipeiver}/taipei20.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
>-install -m 0644 taipeifonts-%{taipeiver}/taipei16.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
>-install -m 0644 taipeifonts-%{taipeiver}/vga12x24.pcf.gz $RPM_BUILD_ROOT%{miscfontdir}
>-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{miscfontdir}/fonts.alias
>-
>-
>-# 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
>+install -d $RPM_BUILD_ROOT%{bmpfontdir}
>+install -m 0644 taipei24.pcf.gz $RPM_BUILD_ROOT%{bmpfontdir}
>+install -m 0644 taipei20.pcf.gz $RPM_BUILD_ROOT%{bmpfontdir}
>+install -m 0644 taipei16.pcf.gz $RPM_BUILD_ROOT%{bmpfontdir}
>+install -m 0644 vga12x24.pcf.gz $RPM_BUILD_ROOT%{bmpfontdir}
>+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{bmpfontdir}/fonts.alias
> 
>+mkfontdir $RPM_BUILD_ROOT%{bmpfontdir}
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> %post
>-{
>-    umask 133
>-
>-    touch %{miscfontdir} 2> /dev/null && {
>-        %{_bindir}/ttmkfdir -d %{miscfontdir} -o %{miscfontdir}/fonts.scale
>-        mkfontdir %{miscfontdir}
>-    }
>-}
>-
>+if [ -x %{_bindir}/fc-cache ]; then
>+  %{_bindir}/fc-cache %{_datadir}/fonts
>+fi
> 
> %postun
>-
>+if [ "$1" = "0" ]; then
>+  if [ -x %{_bindir}/fc-cache ]; then
>+    %{_bindir}/fc-cache %{_datadir}/fonts
>+  fi
>+fi
> 
> %files
> %defattr(-, root, root)
>-%dir %{basefontdir}
>-%dir %{miscfontdir}
>-%{miscfontdir}/*.gz
>-%{miscfontdir}/fonts.alias
>-%ghost %verify(not md5 size mtime) %{basefontdir}/fonts.cache-1
>-%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.dir
>-%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.scale
>-%ghost %verify(not md5 size mtime) %{miscfontdir}/fonts.cache-1
>-
>+%dir %{bmpfontdir}
>+%{bmpfontdir}/*.gz
>+%{bmpfontdir}/fonts.alias
>+%verify(not md5 size mtime) %{bmpfontdir}/fonts.dir
> 
> %changelog
>-* Wed Aug 22 2007 Caius Chance <cchance@redhat.com> - 0.1-1.fc8
>-- Resolves: rhbz#253812 (New package separated from fonts-chinese.)
>+* Tue Sep 25 2007 Jens Petersen <petersen@redhat.com> - 1.2-2
>+- various cleanup and fixes (#253812):
>+- use upstream name and version
>+- drop requires and ghost files
>+- make fonts.dir at buildtime
>+- use standard fc-cache scriptlets
>+
>+* Wed Aug 22 2007 Caius Chance <cchance@redhat.com> - 1.2-1.fc8
>+- package split from fonts-chinese
>+Resolves: rhbz#253812 (New package separated from fonts-chinese.)

Actions: View | Diff

Attachments on bug 253812: 204781 | 209341