SPECS: icc.spec - starting update to 9.0, %build is ok, need to ch...

[djurban]

Author: djurban                      Date: Fri Nov 25 13:08:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- starting update to 9.0, %build is ok, need to check more of %install, add eclipse suppot etc.

---- Files affected:
SPECS:
   icc.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/icc.spec
diff -u SPECS/icc.spec:1.5 SPECS/icc.spec:1.6
--- SPECS/icc.spec:1.5	Mon Jun 28 01:27:04 2004
+++ SPECS/icc.spec	Fri Nov 25 14:08:29 2005
@@ -3,9 +3,9 @@
 # - check all licenses - maybe we can distribute it?
 # - fix "szambo" in %{_bindir}, maybe move unnecesary files to %{_libdir}/icc ?
 # - ia64 version ;)
-%define		fileversion	8.0.055
-%define		iccversion	8.0
-%define		idbversion	7.3.1
+%define		fileversion	9.0.021
+%define		iccversion	9.0
+%define		idbversion	9.0
 Summary:	Intel C Compiler
 Summary(pl):	Kompilator C Intela
 Name:		icc
@@ -58,14 +58,15 @@
 for i in intel-*-*.i386.rpm; do
 	rpm2cpio $i |cpio -i --no-absolute-filenames -d
 done;
-perl -p -i -e "s|<INSTALLDIR>|%{_prefix}|g" opt/intel_cc_*/bin/{icc,icpc,iccvars.csh,iccvars.sh}
+perl -p -i -e "s|<INSTALLDIR>|%{_prefix}|g" opt/intel/cc/%{iccversion}/bin/{icc,icpc,iccvars.csh,iccvars.sh}
+perl -p -i -e "s|<INSTALLDIR>|%{_prefix}|g" opt/intel/idb/%{idbversion}/bin/*.*sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_mandir}/man1,%{_includedir}/icc,%{_datadir}/icc/licenses}
 
 # intel compiler
-cd opt/intel_cc_*
+cd opt/opt/intel/cc/%{iccversion}
 install bin/* $RPM_BUILD_ROOT%{_bindir}
 install man/man1/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install lib/* $RPM_BUILD_ROOT%{_libdir}
@@ -73,7 +74,7 @@
 install licenses/* $RPM_BUILD_ROOT%{_datadir}/icc/licenses
 cd ../..
 # intel debugger
-cd opt/intel_idb_*
+cd opt/opt/intel/idb/%{idbversion}
 install bin/?idb $RPM_BUILD_ROOT%{_bindir}/idb
 install man/man1/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -134,6 +135,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/11/25 13:08:29  djurban
+- starting update to 9.0, %build is ok, need to check more of %install, add eclipse suppot etc.
+
 Revision 1.5  2004/06/27 23:27:04  ankry
 - cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/icc.spec?r1=1.5&r2=1.6&f=u