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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit f13eee7437e8eaee8ac2473a6e295bb102455b6d
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Thu Mar 6 07:41:40 2008 +1100

    gerris.spec version number fix
    
    darcs-hash:20080305204140-d4795-e55d6b90eae039092cbd2e61f1d2fd95b0c1bbdc.gz

diff --git a/configure.in b/configure.in
index 9516ef2..1471a3d 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,7 @@ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
 # if backwards compatibility has been broken,
 # set GFS_BINARY_AGE and GFS_INTERFACE_AGE to 0.
 #
+# Remember to update rpm/gerris.spec when changing the version number.
 GFS_MAJOR_VERSION=1
 GFS_MINOR_VERSION=2
 GFS_MICRO_VERSION=0
diff --git a/rpm/gerris.spec b/rpm/gerris.spec
index 37b0d46..0c4e1cd 100644
--- a/rpm/gerris.spec
+++ b/rpm/gerris.spec
@@ -4,7 +4,7 @@
 Summary: The Gerris Flow Solver
 Name: gerris
 %if "%{current}" == ""
-Version: 1.1.2
+Version: 1.2.0
 %else
 Version: %{current}
 %endif

-- 
Gerris Flow Solver