rpms/grace/devel grace.spec,1.16,1.17

[José Abílio Oliveira Matos (jamatos)]

Author: jamatos

Update of /cvs/pkgs/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21345

Modified Files:
	grace.spec 
Log Message:
* Thu Sep 27 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)



Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/devel/grace.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- grace.spec	28 Aug 2007 17:40:39 -0000	1.16
+++ grace.spec	27 Sep 2007 16:16:02 -0000	1.17
@@ -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 @@
 
 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 @@
     --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 @@
 
 
 %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 @@
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
+%{catalogue}/%{name}-type1
 
 
 %files devel
@@ -175,6 +177,9 @@
 
 
 %changelog
+* Thu Sep 27 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.21-3
+- Remove dependency on chkfontpath, thanks to ajax for the patch. (#252277)
+
 * Tue Aug 28 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.21-2
 - License fix, rebuild for devel (F8).