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

Comparing COMP/CMSDIST/sip.spec (file contents):
Revision 1.3 by eulisse, Fri Jun 12 09:25:24 2009 UTC vs.
Revision 1.7 by elmer, Tue Nov 10 18:39:08 2009 UTC

# Line 1 | Line 1
1 < ### RPM external sip 4.8
2 < ## INITENV +PATH PYTHONPATH %i/lib/python2.4/site-packages
1 > ### RPM external sip 4.8.2
2 > ## INITENV +PATH PYTHONPATH %i/lib/python$(echo $PYTHON_VERSION |cut -d. -f 1,2)/site-packages
3   Source: http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-%realversion.tar.gz
4   Requires: python
5   %prep
6 < %setup -n sip-%realversion
6 > %setup -n sip-%realversion
7  
8   %build
9   python ./configure.py -v %i/share -b %i/bin -d %i/lib/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages -e %i/include
# Line 20 | Line 20 | cat << \EOF_TOOLFILE >%i/etc/scram.d/sip
20   <Client>
21   <Environment name=SIP_BASE default="%i"></Environment>
22   </Client>
23 < <Runtime name=PYTHONPATH value="$SIP_BASE/lib/python2.4/site-packages" type=path>
23 > <Runtime name=PYTHONPATH value="$SIP_BASE/lib/python@PYTHONV@/site-packages" type=path>
24   <use name="python">
25   </Tool>
26   EOF_TOOLFILE
27  
28 + export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
29 + perl -p -i -e 's|\@([^@]*)\@|$ENV{$1}|g' %i/etc/scram.d/*
30 +
31   %post
32   %{relocateConfig}etc/scram.d/sip
33 + %{relocateConfig}lib/python2.4/site-packages/sipconfig.py

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines