rpms/gnu-smalltalk/devel gnu-smalltalk.spec,1.24,1.25

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/gnu-smalltalk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14962

Modified Files:
	gnu-smalltalk.spec 
Log Message:
Try to fixe multilib issue again


Index: gnu-smalltalk.spec
===================================================================
RCS file: /cvs/extras/rpms/gnu-smalltalk/devel/gnu-smalltalk.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gnu-smalltalk.spec	22 Oct 2007 15:36:47 -0000	1.24
+++ gnu-smalltalk.spec	24 Oct 2007 18:50:54 -0000	1.25
@@ -1,7 +1,7 @@
 Summary: GNU Smalltalk
 Name: gnu-smalltalk
 Version: 2.3.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: ftp://ftp.gnu.org/gnu/smalltalk/smalltalk-%{version}.tar.gz
 Patch1: gst-2.3.6-am.patch
 Patch2: gst-2.3.6-pathfix.patch
@@ -51,16 +51,9 @@
 %description emacs
 This Package contains the Smalltalk mode for Emacs.
 
-%package libs
-Summary: Libraries for the GNU Smalltalk package
-Group: Development/Libraries
-%description libs
-This Package contains the Libraires for the GNU Smalltalk system.
-
 %package devel
 Summary: Development Stuff for the GNU Smalltalk package
 Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
 #Requires: automake
 Requires: pkgconfig
 %description devel
@@ -86,8 +79,18 @@
 # _smp_mflags seems not to work
 make LIBTOOL="%{_bindir}/libtool" 
 
+cd doc
+
+for i in gst*; do
+  sed -e 's!%{_libdir}!/usr/lib(64)/!'g \
+      -e 's!/usr/share/gnu-smalltalk/kernel!/usr/lib(64)/gnu-smalltalk/kernel!g' \
+      $i >$i.new
+  mv -f $i.new $i
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
+
 make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -c -p" install
 
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libgst*a*
@@ -126,6 +129,8 @@
 %{_bindir}/gst-reload
 %{_bindir}/gst-sunit
 
+%{_libdir}/libgst.so.*
+
 %{_infodir}/gst.info*
 %{_infodir}/gst-*.info*
 
@@ -134,9 +139,6 @@
 %doc AUTHORS COPYING COPYING.DOC COPYING.LIB ChangeLog 
 %doc NEWS README THANKS TODO
 
-%files libs
-%{_libdir}/libgst.so.*
-
 %{_libdir}/gnu-smalltalk/
 
 %files devel
@@ -155,6 +157,9 @@
 %{_datadir}/emacs/site-lisp/*
 
 %changelog
+* Wed Oct 24 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-4
+- Another try to fix the multilib issue
+
 * Mon Oct 22 2007 Jochen Schmitt <Jochen herr-schmitt de> 2.3.6-3
 - Create new subpackage to solve mulitlib issue (#341341)