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.55 by elmer, Tue Nov 3 15:04:08 2009 UTC vs.
Revision 1.62 by dsr, Wed Feb 24 15:57:48 2010 UTC

# Line 8 | Line 8
8   Requires: expat bz2lib db4 gdbm
9  
10   %if "%online" != "true"
11 < Requires: zlib openssl
11 > Requires: zlib openssl sqlite
12   %endif
13  
14   # FIXME: readline, crypt
# Line 55 | Line 55 | perl -p -i -e "s|#!.*/usr/local/bin/pyth
55   mkdir -p %i/include %i/lib %i/bin
56  
57   %if "%online" != "true"
58 < %define extradirs $ZLIB_ROOT $OPENSSL_ROOT
58 > %define extradirs $ZLIB_ROOT $OPENSSL_ROOT $SQLITE_ROOT
59   %else
60   %define extradirs %{nil}
61   %endif
# Line 117 | Line 117 | case %cmsplatf in
117     (cd %i/lib/python%{pythonv}/config
118      perl -p -i -e 's|-fno-common||g' Makefile)
119  
120 <   find %i/lib/python%{pythonv}/config -name 'libpython*' -exec mv {} %i/lib \;
120 >   find %i/lib/python%{pythonv}/config -name 'libpython*' -exec mv -f {} %i/lib \;
121    ;;
122   esac
123  
# Line 136 | Line 136 | rm  `find %{i}/include -maxdepth 1 -mind
136  
137   %if "%online" == "true"
138   # remove tkinter that brings dependency on libtk:
139 < rm  `find %{i}/lib -type f -name "_tkinter.so"`
139 > find %{i}/lib -type f -name "_tkinter.so" -exec rm {} \;
140   %endif
141  
142   # SCRAM ToolBox toolfile
# Line 165 | Line 165 | rm -f %i/share/doc/python/Demo/rpc/test
165   %post
166   find $RPM_INSTALL_PREFIX/%pkgrel/lib -type l | xargs ls -la | sed -e "s|.*[ ]\(/.*\) -> \(.*\)| \2 \1|;s|[ ]/[^ ]*/external| $RPM_INSTALL_PREFIX/%cmsplatf/external|g" | xargs -n2 ln -sf
167   %{relocateConfig}etc/scram.d/%n
168 + %{relocateConfig}lib/python2.6/config/Makefile

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines