The xaw95 package and XFree86-3.1.2G

[Hugo HAAS <hugo@via.ecp.fr>]

Hi.

I installed the xaw95 package two weeks ago, and it didn't worked. I
finally understood why. In fact, the current installation works fine when
you have XFree86 3.1.2, but it doesn't work anymore when you have a beta
version. 

To make the X Athena Widgets 95 work, libXaw.so.6.1 mustn't be used.  For
the moment, the only means I found is this one : I rename this file to
oldlibXaw.so.6.1 otherwise ldconfig creates a symbolic link to this file,
but it isn't very clean. But I don't know another way to do it... 

So, I propose a little patch for this package.

PS : I hope that's the first time you receive this message, because I
just managed to subscribe to the mailing-list, so I don't know if my first
post worked, but I resent it because I didn't see it in the archive.

---
Hugo HAAS, Engineering Student at Ecole Centrale Paris, France
E-mail : hugo@via.ecp.fr	IRC : Bartman

diff -u xaw95/postinst xaw95.dest/postinst
--- xaw95/postinst	Sat Sep 28 20:57:06 1996
+++ xaw95.dest/postinst	Fri Oct 18 11:36:54 1996
@@ -7,11 +7,22 @@
 
 : ${TMPDIR:=/tmp}
 
+XLIBDIR=/usr/X11R6/lib/
 XAW95DIR=/usr/X11R6/lib/Xaw95
 LDSOCONF=/etc/ld.so.conf
 
 tmpfile=${TMPDIR}/.`basename $0`.$$
 
+if [ -L $XLIBDIR/libXaw.so.6.1 ]
+then
+  rm $XLIBDIR/libXaw.so.6.1
+  ln -s $XAW95DIR/libXaw.so.6.0 $XLIBDIR/libXaw.so.6.1
+elif [ -f /usr/X11R6/lib/libXaw.so.6.1 ]
+  then
+    mv $XLIBDIR/libXaw.so.6.1 $XLIBDIR/old_libXaw.so.6.1
+    ln -s $XAW95DIR/libXaw.so.6.0 $XLIBDIR/libXaw.so.6.1
+fi
+
 (echo $XAW95DIR; grep -v $XAW95DIR $LDSOCONF) >$tmpfile && \
     mv $tmpfile $LDSOCONF
 
@@ -27,4 +38,3 @@
 you will need to put "-L/usr/X11R6/lib/Xaw95" before the "-lXaw" library
 selection when linking.
 EOF
-
diff -u xaw95/prerm xaw95.dest/prerm
--- xaw95/prerm	Sat Sep 28 20:57:06 1996
+++ xaw95.dest/prerm	Fri Oct 18 11:39:02 1996
@@ -7,12 +7,21 @@
 
 : ${TMPDIR:=/tmp}
 
+XLIBDIR=/usr/X11R6/lib
 XAW95DIR=/usr/X11R6/lib/Xaw95
 LDSOCONF=/etc/ld.so.conf
 
 tmpfile=${TMPDIR}/.`basename $0`.$$
 
+if [ -L $XLIBDIR/libXaw.so.6.1 ]
+then
+  rm $XLIBDIR/libXaw.so.6.1
+  if [ -f $XLIBDIR/old_libXaw.so.6.1 ]
+  then
+    mv $XLIBDIR/old_libXaw.so.6.1 $XLIBDIR/libXaw.so.6.1
+  fi
+fi
+
 grep -v $XAW95DIR $LDSOCONF >$tmpfile && mv $tmpfile $LDSOCONF
 
 exit 0
-