From 5a7f4744699ed674b32d4611dc5a5d801ce7fe00 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Wed, 16 Oct 2002 14:17:04 +0000
Subject: [PATCH]  * distrib/alliance.spec.in :    - Mise a jour pour les
 librairies dynamiques.

---
 alliance/src/distrib/alliance.spec.in | 52 ++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/alliance/src/distrib/alliance.spec.in b/alliance/src/distrib/alliance.spec.in
index 7706a999..aa24fe0a 100644
--- a/alliance/src/distrib/alliance.spec.in
+++ b/alliance/src/distrib/alliance.spec.in
@@ -1,15 +1,15 @@
 
 %define       name            alliance
 %define       ver             @VERSION@
-%define       tag             alpha.4
-%define       release         1.asim.1
+%define       release         20021016
+%define       tag             alpha.1
 %define       prefix          @prefix@
 
 
 Name:         %{name}
 Summary:      Alliance VLSI CAD Sytem
-Version:      %{ver}.%{tag}
-Release:      %{release}
+Version:      %{ver}
+Release:      %{release}.%{tag}
 Copyright:    GPL
 Group:        Applications/VLSI
 Source:       %{name}-%{ver}.tar.gz
@@ -31,6 +31,15 @@ such as the 875 000 transistors StaCS superscalar microprocessor and 400 000
 transistors IEEE Gigabit HSL Router.
 
 
+#%package tutorials
+#Summary:      Alliance VLSI CAD Sytem - tutorials
+#Group:        Applications/VLSI
+
+
+#%description tutorials
+#Some tutorails for the Alliance VLSI CAD Sytem.
+
+
 %package sources
 Summary:      Alliance VLSI CAD Sytem - sources
 Group:        Applications/VLSI
@@ -62,7 +71,7 @@ Sources of the Alliance VLSI CAD System, as you might guess...
    ./autostuff
  fi
  cd %{_os}
- ../configure --prefix=%{prefix}
+ ../configure --prefix=%{prefix} --enable-alc-shared
  make DESTDIR=%{buildroot} install
 
  cd ..
@@ -78,9 +87,9 @@ Sources of the Alliance VLSI CAD System, as you might guess...
  tar cf - * | (cd %{buildroot}%{prefix}/src; tar xvf -)
 
 # Copy the Alliance autoconf macros in the right place.
- mkdir -p %{buildroot}/usr/share/aclocal
- (cd %{buildroot}%{prefix}/src; \
-  cp alliance.m4 xpm.m4 motif.m4 %{buildroot}/usr/share/aclocal) 
+#mkdir -p %{buildroot}/usr/share/aclocal
+#(cd %{buildroot}%{prefix}/src; \
+# cp alliance.m4 xpm.m4 motif.m4 %{buildroot}/usr/share/aclocal) 
 
 # Set execution rights on the alc_env.* batchs and adjust ALLIANCE_TOP.
 # This is not clean and has to be moved in the package itself in the
@@ -102,14 +111,28 @@ Sources of the Alliance VLSI CAD System, as you might guess...
  ln -sf %{prefix}/etc/alc_env.sh  /etc/profile.d
  ln -sf %{prefix}/etc/alc_env.csh /etc/profile.d
 
+ grep "^%{prefix}/lib$" /etc/ld.so.conf &> /dev/null
+ [ $? -ne 0 ] && echo "%{prefix}/lib" >> /etc/ld.so.conf
+
+ /sbin/ldconfig
+
 
 %preun
  if [ $1 -eq 0 ]; then
    rm -f /etc/profile.d/alc_env.sh
    rm -f /etc/profile.d/alc_env.csh
+
+   grep -v "^%{prefix}/lib$" /etc/ld.so.conf > /etc/ld.so.conf.new
+   # preserve permissions
+   cat /etc/ld.so.conf.new > /etc/ld.so.conf
+   rm -f /etc/ld.so.conf.new
+
+   /sbin/ldconfig
  fi
 
 
+
+
 %clean
  if [ -d %{buildroot} ]; then rm -r %{buildroot}; fi
 
@@ -131,12 +154,23 @@ Sources of the Alliance VLSI CAD System, as you might guess...
 %{prefix}/doc/*
 
 
+#%files tutorials
+#%{prefix}/tutorials
+
+
 %files sources
 %{prefix}/src
-/usr/share/aclocal/*.m4
+#/usr/share/aclocal/*.m4
 
 
 %changelog
+* Sun Oct 13 2002 Jean-Paul.Chaput <Jean-Paul.Chaput@lip6.fr>
+- autoconf m4 macros moved back in the Alliance source tree to avoid
+  re-declaration on our development computers (on which the macros
+  are in teh source tree).
+- Adopt the versioning scheme from czo.
+- Try to switch to dynamic libraries.
+
 * Wed Jul 17 2002  Jean-Paul.Chaput <Jean-Paul.Chaput@lip6.fr>
 - Moved autoconf m4 macros to /usr/share/aclocal.
 - Synched with the current CVS version of Alliance.