SPECS (AC-branch): gcc.spec - rename libgcc_s.so.1 to have version...

[glen]

Author: glen                         Date: Tue Jan 22 09:25:24 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rename libgcc_s.so.1 to have version suffix to allow co-installation of gcc4; rel 7

---- Files affected:
SPECS:
   gcc.spec (1.241.2.38 -> 1.241.2.39) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.241.2.38 SPECS/gcc.spec:1.241.2.39
--- SPECS/gcc.spec:1.241.2.38	Tue Jan 22 09:43:47 2008
+++ SPECS/gcc.spec	Tue Jan 22 10:25:18 2008
@@ -42,7 +42,7 @@
 Summary(pt_BR):	Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:		gcc
 Version:	%{GCC_VERSION}
-Release:	6
+Release:	7
 Epoch:		5
 License:	GPL v2+
 Group:		Development/Languages
@@ -1447,15 +1447,23 @@
 # but we don't want anything more from install-tools
 rm -rf $gccdir/install-tools
 
+# make soname being a symlink, so we can have alternative implementation (gcc4.spec)
+mv $RPM_BUILD_ROOT%{_slibdir}/libgcc_s.so.{1,%{version}}
+ln -s libgcc_s.so.%{version} $RPM_BUILD_ROOT%{_slibdir}/libgcc_s.so.1
+
 %if %{with multilib}
 ln -sf %{_slibdir}/libgcc_s.so.1 $gccdir/libgcc_s.so
 ln -sf %{_slibdir32}/libgcc_s.so.1 $gccdir/libgcc_s_32.so
 
+# make soname being a symlink, so we can have alternative implementation (gcc4.spec)
+mv $RPM_BUILD_ROOT%{_slibdir32}/libgcc_s.so.{1,%{version}}
+ln -s libgcc_s.so.%{version} $RPM_BUILD_ROOT%{_slibdir32}/libgcc_s.so.1
+
 %if %{with cxx}
 spath=obj-%{_target_platform}/%{_target_platform}
 sfile=libstdc++-v3/include/%{_target_platform}/bits/c++config.h
 dpath=$RPM_BUILD_ROOT%{_includedir}/c++/%{GCC_VERSION}/%{_target_platform}/bits
-if ! cmp $spath/$sfile $spath/32/$sfile > /dev/null ; then
+if ! cmp $spath/$sfile $spath/32/$sfile > /dev/null; then
 	cp -f $spath/$sfile $dpath/c++config64.h
 	cp -f $spath/32/$sfile $dpath/c++config32.h
 	cat > $dpath/c++config.h <<EOF
@@ -1586,13 +1594,12 @@
 
 %files -n libgcc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_slibdir}/lib*.so.*
+%attr(755,root,root) %{_slibdir}/libgcc_s.so.%{version}
 
 %if %{with multilib}
 %files -n libgcc32
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_slibdir32}/lib*.so.*
-#%attr(755,root,root) %{_libdir}/gcc-lib/*/*/libgcc*.so
+%attr(755,root,root) %{_slibdir32}/libgcc_s.so.%{version}
 %endif
 
 %if %{with cxx}
@@ -1966,6 +1973,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.241.2.39  2008-01-22 09:25:18  glen
+- rename libgcc_s.so.1 to have version suffix to allow co-installation of gcc4; rel 7
+
 Revision 1.241.2.38  2008-01-22 08:43:47  glen
 - package (%ghost) or remove shared libs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gcc.spec?r1=1.241.2.38&r2=1.241.2.39&f=u