From e671371443d8d9983944a5bd6ae424d0f3738534 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Mon, 17 May 2010 15:37:30 +0000
Subject: [PATCH] Small corrections in version & release numbers.

---
 bootstrap/buildCoriolis.py  | 6 +++---
 bootstrap/coriolis2.spec.in | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py
index 5ac732b4..36383344 100755
--- a/bootstrap/buildCoriolis.py
+++ b/bootstrap/buildCoriolis.py
@@ -102,7 +102,7 @@ class ProjectBuilder:
 
     def _updateSecondary ( self ):
         self._tarballDir = os.path.join ( self._rootDir, "tarball" )
-        self._archiveDir = os.path.join ( self._tarballDir, "coriolis2-1.0" )
+        self._archiveDir = os.path.join ( self._tarballDir, "coriolis2-1.0.%s" % self._svnTag )
         self._sourceDir  = os.path.join ( self._rootDir, "src" )
         self._osDir      = os.path.join ( self._rootDir
                                         , self._osType
@@ -115,8 +115,8 @@ class ProjectBuilder:
 
         self._specFileIn   = os.path.join ( self._sourceDir, "goodies", "coriolis2.spec.in" )
         self._specFile     = os.path.join ( self._sourceDir, "goodies", "coriolis2.spec" )
-        self._sourceTarBz2 = "coriolis2-1.0-%s.tar.bz2"        % self._svnTag
-        self._binaryTarBz2 = "coriolis2-binary-1.0-%s.tar.bz2" % self._svnTag
+        self._sourceTarBz2 = "coriolis2-1.0.%s.tar.bz2"                  % self._svnTag
+        self._binaryTarBz2 = "coriolis2-binary-1.0.%s-1.el5_soc.tar.bz2" % self._svnTag
         return
 
 
diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in
index fbbc44ff..bcda2330 100644
--- a/bootstrap/coriolis2.spec.in
+++ b/bootstrap/coriolis2.spec.in
@@ -1,4 +1,5 @@
 
+%define       coriolisVersion    1.0
 %define       coriolisTop        @coriolisTop@
 %define       svntag             @svntag@
 
@@ -7,11 +8,11 @@
 
 Name:         coriolis2
 Summary:      Coriolis 2 VLSI CAD Sytem
-Version:      1.0
-Release:      1
+Version:      %{coriolisVersion}.%{svntag}
+Release:      1%{dist}
 License:      LGPL/GPL
 Group:        Applications/Engineering
-Source:       %{name}-%{version}-%{svntag}.tar.bz2
+Source:       %{name}-%{version}.tar.bz2
 URL:          http://www-asim.lip6.fr/
 Packager:     Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
 BuildRoot:    %{_tmppath}/root-%{name}
@@ -72,7 +73,7 @@ EOF
 %if %{with_binarytar}
  cd %{buildroot}%{coriolisTop}
  tar --exclude "*/cmake_modules*" \
-     -jcf %{_sourcedir}/%{name}-binary-%{version}-%{release}-%{svntag}.tar.bz2 \
+     -jcf %{_sourcedir}/%{name}-binary-%{version}-%{release}.tar.bz2 \
      bin lib share
 %endif