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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit e50d0129574fee5709d3a39d88e4dd97c985f989
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Mon May 12 11:34:01 2008 +1000

    New dependencies for RPM packages (I. Vari)
    
    darcs-hash:20080512013401-d4795-25ab6de3a69b5c57715dc43996e5ed7c4e71337d.gz

diff --git a/rpm/gerris.spec b/rpm/gerris.spec
index 0c4e1cd..34c0ba9 100644
--- a/rpm/gerris.spec
+++ b/rpm/gerris.spec
@@ -8,24 +8,30 @@ Version: 1.2.0
 %else
 Version: %{current}
 %endif
-Release: 4.%{alphatag}cvs%{?dist}
+Release: 5.%{alphatag}cvs%{?dist}
 License: GPLv2
-Group: Applications/Engineering
+Group: Productivity/Scientific/Other
 URL: http://gfs.sourceforge.net
 Packager: Ivan Adam Vari <i.vari at niwa.co.nz>
 Source0: %{name}-stable.tar.gz
 Provides: %{name}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: gts-snapshot-devel >= 0.7.6 pkgconfig gcc sed gawk m4
-BuildRequires: gts-snapshot-devel >= 0.7.6 glib2-devel geomview
+%if 0%{?fedora_version}
+Requires: proj gsl netcdf
+%elif 0%{?suse_version}
+Requires: proj4 gsl libnetcdf-4
+%endif
+BuildRequires: gts-snapshot-devel >= 0.7.6 glib2-devel geomview-devel
 BuildRequires: glibc-devel automake libtool gtkglext-devel
-BuildRequires: startup-notification-devel
+BuildRequires: startup-notification-devel gsl-devel
 %if 0%{?fedora_version}
-BuildRequires: libXt-devel netpbm-devel
+BuildRequires: libXt-devel netpbm-devel netcdf-devel
 %elif 0%{?suse_version}
-BuildRequires: xorg-x11-devel libnetpbm
+BuildRequires: xorg-x11-devel libnetpbm libnetcdf-devel
 %endif
 
+
 %description
 Gerris is an Open Source Free Software library for the solution of the 
 partial differential equations describing fluid flow. The source code 
@@ -103,6 +109,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon May 12 2008 Ivan Adam Vari <i.vari at niwa.co.nz> - 5
+- Added new package dependencies, minor fixes
+
 * Mon Jan 7 2008 Ivan Adam Vari <i.vari at niwa.co.nz> - 4
 - Removed %{?_smp_mflags} from make due to intermittent
   build errors on some SMP systems

-- 
Gerris Flow Solver