- Fixed mkfontscale invocation in Type1 font subpackage post/postun scripts

by removing accidental -o argument that creeped in via cut and paste
    error. (#173059)
This commit is contained in:
mharris 2005-11-14 19:24:03 +00:00
parent 98fbc3a51b
commit 8707bde14f

View File

@ -30,7 +30,7 @@
Summary: X.Org X11 fonts
Name: xorg-x11-fonts
Version: 0.99.0
Release: 5
Release: 6
License: Various licenses
Group: User Interface/X
URL: http://www.x.org
@ -527,7 +527,7 @@ done
%post Type1
{
FONTDIR=%{_type1_fontdir}/Type1
mkfontscale $FONTDIR -o $FONTDIR/fonts.scale
mkfontscale $FONTDIR
mkfontdir $FONTDIR
/usr/sbin/chkfontpath -q -a $FONTDIR
fc-cache $FONTDIR
@ -538,7 +538,7 @@ done
{
FONTDIR=%{_type1_fontdir}/Type1
if [ "$1" = "0" ]; then
mkfontscale $FONTDIR -o $FONTDIR/fonts.scale
mkfontscale $FONTDIR
mkfontdir $FONTDIR
fc-cache $FONTDIR
fi
@ -573,7 +573,8 @@ done
mkfontdir $FONTDIR
/usr/sbin/chkfontpath -q -a $FONTDIR
fc-cache $FONTDIR
} &> /dev/null || :
}
# &> /dev/null || :
%postun syriac
{
@ -583,7 +584,8 @@ done
mkfontdir $FONTDIR
fc-cache $FONTDIR
fi
} &> /dev/null || :
}
# &> /dev/null || :
%if %{with_ethiopic_fonts}
%post ethiopic
@ -593,6 +595,7 @@ done
mkfontdir $FONTDIR
/usr/sbin/chkfontpath -q -a $FONTDIR
fc-cache $FONTDIR
FONTDIR=%{_otf_fontdir}/OTF
mkfontscale $FONTDIR
mkfontdir $FONTDIR
@ -702,6 +705,7 @@ done
mkfontdir %{_x11fontdir}/75dpi
fi
}
# &> /dev/null || :
%postun 100dpi
{
@ -709,6 +713,7 @@ done
mkfontdir %{_x11fontdir}/100dpi
fi
}
# &> /dev/null || :
%postun ISO8859-2-75dpi
{
@ -716,6 +721,7 @@ done
mkfontdir %{_x11fontdir}/75dpi
fi
}
# &> /dev/null || :
%postun ISO8859-2-100dpi
{
@ -723,6 +729,7 @@ done
mkfontdir %{_x11fontdir}/100dpi
fi
}
# &> /dev/null || :
%postun ISO8859-9-75dpi
{
@ -730,6 +737,7 @@ done
mkfontdir %{_x11fontdir}/75dpi
fi
}
# &> /dev/null || :
%postun ISO8859-9-100dpi
{
@ -737,6 +745,7 @@ done
mkfontdir %{_x11fontdir}/100dpi
fi
}
# &> /dev/null || :
%postun ISO8859-14-75dpi
{
@ -744,6 +753,7 @@ done
mkfontdir %{_x11fontdir}/75dpi
fi
}
# &> /dev/null || :
%postun ISO8859-14-100dpi
{
@ -751,6 +761,7 @@ done
mkfontdir %{_x11fontdir}/100dpi
fi
}
# &> /dev/null || :
%postun ISO8859-15-75dpi
{
@ -758,6 +769,7 @@ done
mkfontdir %{_x11fontdir}/75dpi
fi
}
# &> /dev/null || :
%postun ISO8859-15-100dpi
{
@ -765,6 +777,7 @@ done
mkfontdir %{_x11fontdir}/100dpi
fi
}
# &> /dev/null || :
%postun cyrillic
{
@ -772,6 +785,7 @@ done
mkfontdir %{_x11fontdir}/cyrillic
fi
}
# &> /dev/null || :
#--------------------------------------------------------------------------
%check
@ -1424,6 +1438,11 @@ rm -rf $RPM_BUILD_ROOT
%ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
%changelog
* Mon Nov 14 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-6
- Fixed mkfontscale invocation in Type1 font subpackage post/postun scripts
by removing accidental -o argument that creeped in via cut and paste
error. (#173059)
* Sun Nov 13 2005 Jeremy Katz <katzj@redhat.com> - 0.99.0-5
- don't use :unscaled for base fonts as a temporary workaround for #172997