[SCM] Gerris Flow Solver branch, upstream, updated. e8f73a07832050124d2b8bf6c6f35b33180e65a8

[Matthieu Castellazzi]

The following commit has been merged in the upstream branch:
commit 6a902e4863c63e11d53164338e0b59cb70740a4b
Author: Matthieu Castellazzi <m.castellazzi at niwa.co.nz>
Date:   Wed Sep 16 10:14:20 2009 +1000

    Some fixes to the rpm spec file
    
    darcs-hash:20090916001420-3dc18-f6e986fc25aa0ea352cb236ebddf54036b1105d7.gz

diff --git a/Makefile.am b/Makefile.am
index 07a1add..dac7ce1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@ LOG = /var/www/gerris/version/gerris_changes
 
 SUBDIRS = modules src tools test doc desktop debian
 
-EXTRA_DIST = ChangeLog
+EXTRA_DIST = ChangeLog m4
 
 if DARCS_CONTROLLED
 DARCS_CHANGELOG = changelog
diff --git a/rpm/gerris.spec b/rpm/gerris.spec
index 36297e8..a70afb4 100644
--- a/rpm/gerris.spec
+++ b/rpm/gerris.spec
@@ -29,7 +29,7 @@ BuildRequires: netcdf-devel proj-devel gcc-gfortran
 %endif
 %if 0%{?suse_version}
 Requires: libproj0 gsl libnetcdf-4
-BuildRequires: libnetcdf-devel libproj-devel gcc-gfortran
+BuildRequires: libnetcdf-devel libproj-devel gcc-fortran
 %endif
 # For both distros
 Requires: gts-snapshot-devel >= %{gts_version} pkgconfig gcc sed gawk m4
@@ -146,12 +146,16 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc NEWS README TODO COPYING
 %{_bindir}/*
 %{_includedir}/*.h
+%dir %{_includedir}/gerris
 %{_includedir}/gerris/*.h
 %{_libdir}/*.so.*
 %{_libdir}/*.so
+%dir %{_libdir}/gerris
 %{_libdir}/gerris/*
 %{_libdir}/pkgconfig/*.pc
+%dir %{_datadir}/gerris
 %{_datadir}/gerris/gfs.lang
+%{_datadir}/gerris/gerris.dic
 %{_datadir}/mime/packages/*.xml
 %{_datadir}/icons/hicolor/48x48/mimetypes/*.png
 %{_mandir}/man1/*.gz

-- 
Gerris Flow Solver