--- a/ChangeLog	Sun Oct 23 09:46:59 2011 +0000
+++ b/ChangeLog	Sun Oct 23 09:48:48 2011 +0000
@@ -1,6 +1,7 @@
 2011-10-23 Milan Jurik <[email protected]>
 
 	* include/arch64.inc: use -m64 instead of -xarch=generic64
+	* encumbered/SFElibgsm.spec: fix multiarch
 
 2011-10-22 Ken Mays <[email protected]>
 

--- a/base-specs/libgsm.spec	Sun Oct 23 09:46:59 2011 +0000
+++ b/base-specs/libgsm.spec	Sun Oct 23 09:48:48 2011 +0000
@@ -25,44 +25,45 @@
 %patch1 -p1
 
 %build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-     CPUS=1
-fi
-
 rm -f bin/* lib/* shared/* src/*.o test/*.o
 
+%install
 export PICFLAG="-KPIC"
 export OPTFLAGS="%optflags"
 export LDFLAGS="%_ldflags"
 
 if $( echo "%{_libdir}" | /usr/xpg4/bin/grep -q %{_arch64} ) ; then
-	export LDFLAGS="$LDFLAGS -m64"
+        export LDFLAGS="$LDFLAGS -m64"
 fi
 
-make 
-
-%install
 mkdir -p $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{1,3},%{_includedir}/gsm,%{_libdir}}
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL_ROOT=%{_prefix}
 
+# keep compatibility with other distros
+cp -r inc/*.h $RPM_BUILD_ROOT%{_includedir}/gsm
+
 if $( echo "%{_libdir}" | /usr/xpg4/bin/grep -q %{_arch64} ) ; then
 	mkdir -p $RPM_BUILD_ROOT/%{_libdir}
 	mv $RPM_BUILD_ROOT/%{_libdir}/../libgsm.* $RPM_BUILD_ROOT/%{_libdir}
+	mkdir -p $RPM_BUILD_ROOT/%{_bindir}
+	mv $RPM_BUILD_ROOT/%{_bindir}/../toast $RPM_BUILD_ROOT/%{_bindir}
 fi
 
 if $( echo "%{_libdir}" | /usr/xpg4/bin/grep -q %{sse2_arch} ) ; then
         mkdir -p $RPM_BUILD_ROOT/%{_libdir}
         mv $RPM_BUILD_ROOT/%{_libdir}/../libgsm.* $RPM_BUILD_ROOT/%{_libdir}
-fi
+	rmdir $RPM_BUILD_ROOT/%{_bindir}
+else
+	cd $RPM_BUILD_ROOT/%{_bindir} && ln -fs toast untoast && ln -fs toast tcat
 
-# keep compatibility with other distros
-cp -r inc/*.h $RPM_BUILD_ROOT%{_includedir}/gsm
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sun Oct 23 2011 - Milan Jurik
+- fix multiarch
 * Sun Nov 28 2010 - Milan Jurik
 - add pentium_pro+mmx lib
 * Wed Jun 16 2010 - Milan Jurik

--- a/encumbered/SFElibgsm.spec	Sun Oct 23 09:46:59 2011 +0000
+++ b/encumbered/SFElibgsm.spec	Sun Oct 23 09:48:48 2011 +0000
@@ -82,35 +82,51 @@
 
 %libgsm.install -d %name-%version/%{base_arch}
 
+%if %can_isaexec
+mkdir $RPM_BUILD_ROOT%{_bindir}/%{base_isa}
+mv $RPM_BUILD_ROOT%{_bindir}/toast  $RPM_BUILD_ROOT%{_bindir}/%{base_isa}/
+mv $RPM_BUILD_ROOT%{_bindir}/tcat  $RPM_BUILD_ROOT%{_bindir}/%{base_isa}/
+mv $RPM_BUILD_ROOT%{_bindir}/untoast  $RPM_BUILD_ROOT%{_bindir}/%{base_isa}/
+cd $RPM_BUILD_ROOT%{_bindir} && ln -s ../lib/isaexec toast
+cd $RPM_BUILD_ROOT%{_bindir} && ln -s ../lib/isaexec tcat
+cd $RPM_BUILD_ROOT%{_bindir} && ln -s ../lib/isaexec untoast
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr (-, root, bin)
+%if %can_isaexec
+%ifarch amd64 sparcv9
+%{_bindir}/%{_arch64}
+%endif
+%{_bindir}/%{base_isa}
+%hard %{_bindir}/toast
+%hard %{_bindir}/tcat
+%hard %{_bindir}/untoast
+%else
 %{_bindir}
-%dir %attr (0755, root, bin) %{_libdir}
+%endif
 %{_libdir}/lib*.so*
 %ifarch amd64 sparcv9
-%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
 %{_libdir}/%{_arch64}/lib*.so*
 %endif
 %if %arch_sse2
-%dir %attr (0755, root, bin) %{_libdir}/%{sse2_arch}
 %{_libdir}/%{sse2_arch}/lib*.so*
 %endif
 %dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, bin) %{_mandir}
 %{_mandir}/man1
 
 %files devel
 %defattr (-, root, bin)
 %{_includedir}
 %dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, bin) %{_mandir}
 %{_mandir}/man3
 
 %changelog
+* Sun Oct 23 2011 - Milan Jurik
+- fix multiarch
 * Mon Oct 10 2011 - Milan Jurik
 - add IPS package name
 * Wed Jul 20 2011 - Alex Viskovatoff

--- a/patches/libgsm-01-makefile.diff	Sun Oct 23 09:46:59 2011 +0000
+++ b/patches/libgsm-01-makefile.diff	Sun Oct 23 09:48:48 2011 +0000
@@ -1,5 +1,5 @@
---- gsm-1.0-pl12/Makefile.orig	2007-08-01 13:16:42.866319697 +0700
-+++ gsm-1.0-pl12/Makefile	2007-08-01 13:50:03.271259284 +0700
+--- gsm-1.0-pl13/Makefile	Sun Oct 23 11:19:08 2011
++++ gsm-1.0-pl13/Makefile	Sun Oct 23 11:16:48 2011
 @@ -30,6 +30,8 @@
  ######### define this, and read about the GSM_OPT_WAV49 option in the
  ######### manual page on gsm_option(3).
@@ -20,7 +20,7 @@
  
  LD 		= $(CC)
  
-@@ -71,17 +73,17 @@
+@@ -71,7 +73,7 @@
  # Leave INSTALL_ROOT empty (or just don't execute "make install") to
  # not install gsm and toast outside of this directory.
  
@@ -29,6 +29,7 @@
  
  # Where do you want to install the gsm library, header file, and manpages?
  #
+@@ -78,10 +80,10 @@
  # Leave GSM_INSTALL_ROOT empty to not install the GSM library outside of
  # this directory.
  
@@ -92,7 +93,7 @@
  		$(GSM_INSTALL_INC)/gsm.h		\
  		$(GSM_INSTALL_MAN)/gsm.3		\
  		$(GSM_INSTALL_MAN)/gsm_explode.3	\
-@@ -301,8 +303,7 @@
+@@ -301,14 +303,13 @@
  
  $(LIBGSM):	$(LIB) $(GSM_OBJECTS)
  		-rm $(RMFLAGS) $(LIBGSM)
@@ -102,6 +103,13 @@
  
  
  # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+ $(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) -lgsm -L./lib $(LDLIB)
+ 
+ $(UNTOAST):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(UNTOAST)
 @@ -393,9 +394,10 @@
  		cp $? $@
  		chmod 444 $@