diff --git a/grace.spec b/grace.spec index c3f116f..ba307a3 100644 --- a/grace.spec +++ b/grace.spec @@ -1,6 +1,9 @@ +%define _x11fontdir %{_datadir}/X11/fonts +%define catalogue /etc/X11/fontpath.d + Name: grace Version: 5.1.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Numerical Data Processing and Visualization Tool License: GPLv2+ @@ -28,8 +31,6 @@ BuildRequires: libXpm-devel Requires: nedit Requires: htmlview -Requires(post): chkfontpath -Requires(postun): chkfontpath %description Grace is a Motif application for two-dimensional data visualization. @@ -129,13 +130,14 @@ desktop-file-install --vendor fedora --delete-original \ --add-category Graphics \ %{buildroot}%{_datadir}/applications/%{name}.desktop +mkdir -p $RPM_BUILD_ROOT%{catalogue} +ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1 %clean rm -rf %{buildroot} %post -%{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1 touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : @@ -143,7 +145,6 @@ fi %postun -%{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1 touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : @@ -163,6 +164,7 @@ fi %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/*/* %{_mandir}/man*/* +%{catalogue}/%{name}-type1 %files devel @@ -175,6 +177,9 @@ fi %changelog +* Thu Sep 27 2007 José Matos - 5.1.21-3 +- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277) + * Tue Aug 28 2007 José Matos - 5.1.21-2 - License fix, rebuild for devel (F8).