ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/python.spec
(Generate patch)

Comparing COMP/CMSDIST/python.spec (file contents):
Revision 1.67 by eulisse, Wed Aug 11 13:00:09 2010 UTC vs.
Revision 1.68 by lat, Fri Sep 10 16:25:11 2010 UTC

# Line 129 | Line 129 | find %i -type f -perm -555 -name '*.py'
129   find %i -type f -perm -555 -name '*.py' -exec perl -p -i -e 'if ($. == 1) {s|/usr/local/bin/python|/usr/bin/env python|}' {} \;
130   rm -f %i/share/doc/python/Demo/rpc/test
131  
132 < # Setups dependencies environment
133 < rm -rf %i/etc/profile.d
132 > # Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment.
133   mkdir -p %i/etc/profile.d
134 < for x in %pkgreqs; do
135 <  case $x in /* ) continue ;; esac
136 <  p=%{instroot}/%{cmsplatf}/$(echo $x | sed 's/\([^+]*\)+\(.*\)+\([A-Z0-9].*\)/\1 \2 \3/' | tr ' ' '/')
137 <  echo ". $p/etc/profile.d/init.sh" >> %i/etc/profile.d/dependencies-setup.sh
138 <  echo "source $p/etc/profile.d/init.csh" >> %i/etc/profile.d/dependencies-setup.csh
134 > : > %i/etc/profile.d/dependencies-setup.sh
135 > : > %i/etc/profile.d/dependencies-setup.csh
136 > for tool in $(echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'); do
137 >  root=$(echo $tool | tr a-z- A-Z_)_ROOT; eval r=\$$root
138 >  if [ X"$r" != X ] && [ -r "$r/etc/profile.d/init.sh" ]; then
139 >    echo "test X\$$root != X || . $r/etc/profile.d/init.sh" >> %i/etc/profile.d/dependencies-setup.sh
140 >    echo "test X\$$root != X || source $r/etc/profile.d/init.csh" >> %i/etc/profile.d/dependencies-setup.csh
141 >  fi
142   done
143  
144   %post
145   %{relocateConfig}lib/python2.6/config/Makefile
146 < %{relocateConfig}etc/profile.d/dependencies-setup.sh
145 < %{relocateConfig}etc/profile.d/dependencies-setup.csh
146 <
146 > %{relocateConfig}etc/profile.d/dependencies-setup.*sh

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines