From 8aa0caf6e8609428b7be33a9dadb2d46d521c6fe Mon Sep 17 00:00:00 2001
From: José Abílio Oliveira Matos <jamatos@fedoraproject.org>
Date: Sep 28 2007 23:39:06 +0000
Subject: - Correctly detect netcdf (signature has changed).

- Add libXmu-devel as BR.
- Add conditional dependency on chkfontpath for <= F8.

---

diff --git a/grace-detect-netcdf.diff b/grace-detect-netcdf.diff
new file mode 100644
index 0000000..ba914ca
--- /dev/null
+++ b/grace-detect-netcdf.diff
@@ -0,0 +1,11 @@
+--- configure.old	2007-02-16 22:44:49.000000000 +0000
++++ configure	2007-09-28 23:03:29.000000000 +0100
+@@ -15181,7 +15181,7 @@
+       int main(void) {
+         char *vlib;
+         vlib = nc_inq_libvers();
+-        if (strcmp(vlib, "3.0") < 0) {
++        if (strcmp(vlib, "\"3.0\"") < 0) {
+           exit(1);
+         }
+         exit(0);
diff --git a/grace.spec b/grace.spec
index c3f116f..affcb42 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:        4%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -11,13 +14,14 @@ Source1:        %{name}.desktop
 Source2:        %{name}.png
 Source3:	cephes-license.email
 Source4:	LICENSE.cephes
-Patch:          %{name}-gracerc-no_auxiliary.diff
+Patch0:         %{name}-gracerc-no_auxiliary.diff
+Patch1:	        %{name}-detect-netcdf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          Applications/Engineering
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires:  xbae-devel, gcc-gfortran
+BuildRequires:  xbae-devel, gcc-gfortran, libXmu-devel
 BuildRequires:  desktop-file-utils, font-utils
 
 %if "%{fedora}" < "5"
@@ -28,8 +32,10 @@ BuildRequires: libXpm-devel
 
 Requires:	nedit
 Requires:	htmlview
+%if "%{fedora}" < "8"
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
+%endif
 
 %description
 Grace is a Motif application for two-dimensional data visualization.
@@ -52,7 +58,9 @@ Install these files if you need to compile software that requires grace.
 
 %prep
 %setup -q
-%patch
+%patch0
+%patch1
+
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
 rm -rf Xbae
@@ -69,7 +77,6 @@ cp %{SOURCE3} %{SOURCE4} .
     --with-x \
     --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
-    --with-extra-ldpath=%{_libdir}/netcdf-3 \
     --with-bundled-xbae=no
     
 make %{?_smp_mflags}
@@ -129,13 +136,19 @@ desktop-file-install --vendor fedora --delete-original    \
     --add-category Graphics	                            \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%if "%{fedora}" >= "8"
+mkdir -p $RPM_BUILD_ROOT%{catalogue}
+ln -sf %{_datadir}/%{name}/type1 $RPM_BUILD_ROOT%{catalogue}/%{name}-type1
+%endif
 
 %clean
 rm -rf %{buildroot}
 
 
 %post
+%if "%{fedora}" < "8"
 %{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
+%endif
 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 +156,9 @@ fi
 
 
 %postun
+%if "%{fedora}" < "8"
 %{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
+%endif
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -163,7 +178,9 @@ fi
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
-
+%if "%{fedora}" >= "8"
+%{catalogue}/%{name}-type1
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -175,6 +192,14 @@ fi
 
 
 %changelog
+* Fri Sep 28 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.21-4
+- Correctly detect netcdf (signature has changed).
+- Add libXmu-devel as BR.
+- Add conditional dependency on chkfontpath for <= F8.
+
+* 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).