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.46 by valya, Thu May 14 16:52:29 2009 UTC vs.
Revision 1.49 by valya, Sun Jun 7 23:41:37 2009 UTC

# Line 1 | Line 1
1 < ### RPM external python 2.5.4
1 > ### RPM external python 2.6.2
2   ## INITENV +PATH PATH %i/bin
3   ## INITENV +PATH LD_LIBRARY_PATH %i/lib
4   # OS X patches and build fudging stolen from fink
# Line 122 | Line 122 | esac
122   perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/idle \
123                      %{i}/bin/pydoc \
124                      %{i}/bin/python-config \
125 <                    %{i}/bin/python2.5-config \
125 >                    %{i}/bin/python2.6-config \
126                      %{i}/bin/smtpd.py \
127 <                    %{i}/lib/python2.5/bsddb/dbshelve.py \
128 <                    %{i}/lib/python2.5/test/test_bz2.py \
129 <                    %{i}/lib/python2.5/test/test_largefile.py \
130 <                    %{i}/lib/python2.5/test/test_optparse.py
127 >                    %{i}/lib/python2.6/bsddb/dbshelve.py \
128 >                    %{i}/lib/python2.6/test/test_bz2.py \
129 >                    %{i}/lib/python2.6/test/test_largefile.py \
130 >                    %{i}/lib/python2.6/test/test_optparse.py
131   rm  `find %{i}/lib -maxdepth 1 -mindepth 1 ! -name '*python*'`
132   rm  `find %{i}/include -maxdepth 1 -mindepth 1 ! -name '*python*'`
133  
# Line 141 | Line 141 | mkdir -p %i/etc/scram.d
141   cat << \EOF_TOOLFILE >%i/etc/scram.d/%n
142   <doc type=BuildSystem::ToolDoc version=1.0>
143   <Tool name=%n version=%v>
144 < <lib name=python2.5>
144 > <lib name=python2.6>
145   <Client>
146   <Environment name=PYTHON_BASE default="%i"></Environment>
147   <Environment name=LIBDIR default="$PYTHON_BASE/lib"></Environment>
148 < <Environment name=INCLUDE default="$PYTHON_BASE/include/python2.5"></Environment>
149 < <Environment name=PYTHON_COMPILE default="$PYTHON_BASE/lib/python2.5/compileall.py"></Environment>
148 > <Environment name=INCLUDE default="$PYTHON_BASE/include/python2.6"></Environment>
149 > <Environment name=PYTHON_COMPILE default="$PYTHON_BASE/lib/python2.6/compileall.py"></Environment>
150   </Client>
151   <use name=sockets>
152   <Runtime name=PATH value="$PYTHON_BASE/bin" type=path>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines