Attachment 157922 Details for Bug 245784 – specfile patch

[patch] specfile patch

urw-fonts.patch (text/plain), 2.48 KB, created by Kristian Høgsberg on 2007-06-26 17:49:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristian Høgsberg

Created: 2007-06-26 17:49:08 UTC

Size: 2.48 KB

patch

obsolete

>? .build-2.3-7.fc8.log
>? clog
>? noarch
>? urw-fonts-2.3
>? urw-fonts-2.3-7.fc8.src.rpm
>? urw-fonts.patch
>Index: urw-fonts.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/urw-fonts/devel/urw-fonts.spec,v
>retrieving revision 1.26
>diff -u -p -r1.26 urw-fonts.spec
>--- urw-fonts.spec	12 Jul 2006 08:37:35 -0000	1.26
>+++ urw-fonts.spec	26 Jun 2007 17:48:35 -0000
>@@ -1,10 +1,11 @@
> %define filippov_version 1.0.7pre40
> %define fontdir %{_datadir}/fonts/default/Type1
>+%define catalogue /etc/X11/fontpath.d
> 
> Summary: Free versions of the 35 standard PostScript fonts.
> Name: urw-fonts
> Version: 2.3
>-Release: 6.1.1
>+Release: 7%{?dist}
> Source: ftp://ftp.gnome.ru/fonts/urw/release/urw-fonts-%{filippov_version}.tar.bz2
> Source1: n022003l.afm
> Source2: n022003l.pfb
>@@ -20,8 +21,8 @@ Group: User Interface/X
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> BuildArchitectures: noarch
> 
>-Requires(post): chkfontpath, fontconfig, mkfontscale, mkfontdir
>-Requires(postun): chkfontpath, fontconfig
>+Requires(post): fontconfig, mkfontscale, mkfontdir
>+Requires(postun): fontconfig
> 
> %description 
> Free, good quality versions of the 35 standard PostScript(TM) fonts,
>@@ -48,12 +49,15 @@ install -m 0644 %{SOURCE1} %{SOURCE2} %{
> # Touch ghosted files
> touch $RPM_BUILD_ROOT%{fontdir}/{fonts.{dir,scale,cache-1},encodings.dir}
> 
>+# Install catalogue symlink
>+mkdir -p $RPM_BUILD_ROOT%{catalogue}
>+ln -sf %{fontdir} $RPM_BUILD_ROOT%{catalogue}/fonts-default
>+
> %post
> {
>    umask 133
>    mkfontscale %{fontdir}
>    `which mkfontdir` %{fontdir}
>-   /usr/sbin/chkfontpath -q -a %{fontdir}
>    fc-cache %{_datadir}/fonts
> } &> /dev/null || :
> 
>@@ -61,7 +65,6 @@ touch $RPM_BUILD_ROOT%{fontdir}/{fonts.{
> {
>    if [ "$1" = "0" ]; then
>       fc-cache %{_datadir}/fonts
>-      /usr/sbin/chkfontpath -q -r %{fontdir} || :
>    fi
> } &> /dev/null || :
> 
>@@ -73,6 +76,8 @@ rm -rf $RPM_BUILD_ROOT
> %doc COPYING README README.tweaks TODO
> %dir %{_datadir}/fonts/default
> %dir %{fontdir}
>+%dir %{catalogue}
>+%{catalogue}/fonts-default
> %ghost %verify(not md5 size mtime) %{fontdir}/fonts.dir
> %ghost %verify(not md5 size mtime) %{fontdir}/fonts.scale
> %ghost %verify(not md5 size mtime) %{fontdir}/fonts.cache-1
>@@ -81,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
> %{fontdir}/*.pfb
> 
> %changelog
>+* Tue Jun 26 2007 Kristian HÃ¸gsberg <krh@redhat.com> - 2.3-7
>+- Drop chkfontpath dependency and use the catalogue font path mechanism.
>+
> * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.3-6.1.1
> - rebuild
>

Actions: View | Diff

Attachments on bug 245784: 157922