Author: glen Date: Sat Nov 26 02:09:21 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - sed rules - %build unneccessary - shorten wrappers
---- Files affected: SPECS: icc.spec (1.6 -> 1.7) ---- Diffs: ================================================================ Index: SPECS/icc.spec diff -u SPECS/icc.spec:1.6 SPECS/icc.spec:1.7 --- SPECS/icc.spec:1.6 Fri Nov 25 14:08:29 2005 +++ SPECS/icc.spec Sat Nov 26 03:09:15 2005 @@ -17,6 +17,7 @@ # NoSource0-md5: df3deb1b1cfe56cf64d1c7cd2e694805 NoSource: 0 URL: http://www.intel.com +BuildRequires: sed >= 4.0 Requires: %{name}-libs = %{fileversion}-%{release} ExclusiveArch: %{ix86} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -54,12 +55,11 @@ %prep %setup -q -n l_cc_p_%{fileversion} -%build 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/%{iccversion}/bin/{icc,icpc,iccvars.csh,iccvars.sh} -perl -p -i -e "s|<INSTALLDIR>|%{_prefix}|g" opt/intel/idb/%{idbversion}/bin/*.*sh + rpm2cpio $i | cpio -i --no-absolute-filenames -d +done +sed -i -e 's|<INSTALLDIR>|%{_prefix}|g' opt/intel/cc/%{iccversion}/bin/{icc,icpc,iccvars.csh,iccvars.sh} +sed -i -e 's|<INSTALLDIR>|%{_prefix}|g' opt/intel/idb/%{idbversion}/bin/*.*sh %install rm -rf $RPM_BUILD_ROOT @@ -78,28 +78,16 @@ install bin/?idb $RPM_BUILD_ROOT%{_bindir}/idb install man/man1/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 -cat >$RPM_BUILD_ROOT%{_bindir}/icc <<EOF +cat > $RPM_BUILD_ROOT%{_bindir}/icc <<'EOF' #!/bin/sh -INTEL_LICENSE_FILE=/usr/share/icc/licenses; -export INTEL_LICENSE_FILE -if [ \$# != 0 ] -then - exec /usr/bin/iccbin "\$@"; -else - exec /usr/bin/iccbin; -fi +export INTEL_LICENSE_FILE=/usr/share/icc/licenses +exec /usr/bin/iccbin ${1:+"$@"} EOF -cat >$RPM_BUILD_ROOT%{_bindir}/icpc <<EOF +cat > $RPM_BUILD_ROOT%{_bindir}/icpc <<'EOF' #!/bin/sh -INTEL_LICENSE_FILE=/usr/share/icc/licenses; -export INTEL_LICENSE_FILE -if [ \$# != 0 ] -then - exec /usr/bin/icpcbin "\$@"; -else - exec /usr/bin/icpcbin; -fi +export INTEL_LICENSE_FILE=/usr/share/icc/licenses +exec /usr/bin/icpcbin ${1:+"$@"} EOF %clean @@ -135,6 +123,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2005/11/26 02:09:15 glen +- sed rules +- %build unneccessary +- shorten wrappers + 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. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/icc.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
