From da6d10883ab7d7483c9a71697bde7bbf29f81180 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Sat, 22 May 2010 09:08:31 +0000
Subject: [PATCH]   * ./goodies:     - Change: In coriolis2.spec.in, now do a
 install "in system", that is         under /usr witch configuration in /etc.
 Create a patch file to         sets up accordingly the pathes in
 configurations files.     - Change: More accurate detection of the qt version
 based on distribution         recognition (%{rhel} & %{fedora}).

---
 bootstrap/coriolis2-for-distribution.patch | 26 ++++++++++++++++++++++
 bootstrap/coriolis2.spec.in                | 10 +++++----
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 bootstrap/coriolis2-for-distribution.patch

diff --git a/bootstrap/coriolis2-for-distribution.patch b/bootstrap/coriolis2-for-distribution.patch
new file mode 100644
index 00000000..1c050472
--- /dev/null
+++ b/bootstrap/coriolis2-for-distribution.patch
@@ -0,0 +1,26 @@
+--- crlcore/etc/environment.alliance.xml.soc	2010-05-22 11:00:46.000000000 +0200
++++ crlcore/etc/environment.alliance.xml	2010-05-22 11:02:18.000000000 +0200
+@@ -1,18 +1,18 @@
+ <?xml version="1.0"?>
+ <environment>
+-  <variable name="CELL_TOP" value="/opt/alliance-5.0"/>
++  <variable name="CELL_TOP" value="/usr/share/alliance"/>
+   <technologies>
+     <hurricane>
+-      <config>${CORIOLIS_TOP}/etc/coriolis2/technology.symbolic.xml</config>
++      <config>/etc/coriolis2/technology.symbolic.xml</config>
+     </hurricane>
+     <real>
+-      <config>${CORIOLIS_TOP}/etc/coriolis2/technology.hcmos9.s2r.xml</config>
++      <config>/etc/coriolis2/technology.hcmos9.s2r.xml</config>
+     </real>
+     <lef>
+-      <config>${CORIOLIS_TOP}/etc/coriolis2/cmos.lef</config>
++      <config>/etc/coriolis2/cmos.lef</config>
+     </lef>
+     <display>
+-      <config>${CORIOLIS_TOP}/etc/coriolis2/display.xml</config>
++      <config>/etc/coriolis2/display.xml</config>
+     </display>
+   </technologies>
+   <libraries>
diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in
index 5becd873..775f8d3d 100644
--- a/bootstrap/coriolis2.spec.in
+++ b/bootstrap/coriolis2.spec.in
@@ -1,14 +1,14 @@
 
 %define          coriolisVersion    1.0
-%define          coriolisTop        @coriolisTop@
+%define          coriolisTop        %{_prefix}
 %define          svntag             @svntag@
 	     
 %define          with_binarytar     %{?_with_binarytar:1}%{!?_with_binarytar:0}
 
-%if %{!?rhel:6} < 6
-%define          qt4                qt4
-%else
+%if 0%{?rhel} > 5 || 0%{?fedora} > 10
 %define          qt4                qt
+%else
+%define          qt4                qt4
 %endif
 	     
 	     
@@ -19,6 +19,7 @@ Release:         1%{dist}
 License:         LGPL/GPL
 Group:           Applications/Engineering
 Source:          %{name}-%{version}.tar.bz2
+Patch0:          coriolis2-for-distribution.patch
 URL:             http://www-asim.lip6.fr/
 Packager:        Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
 Requires(post):  ldconfig
@@ -47,6 +48,7 @@ Development files for the Coriolis 2 package.
 
 %prep
 %setup
+%patch0 -p0 -b .soc
 
 
 %build