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.73 by lat, Fri Jun 24 08:10:20 2011 UTC

# Line 1 | Line 1
1 < ### RPM external python 2.5.4
1 > ### RPM external python 2.6.4
2   ## INITENV +PATH PATH %i/bin
3   ## INITENV +PATH LD_LIBRARY_PATH %i/lib
4 + ## INITENV SETV PYTHON_LIB_SITE_PACKAGES lib/python%{python_major_version}/site-packages
5   # OS X patches and build fudging stolen from fink
6 + %{expand:%%define python_major_version %(echo %realversion | cut -d. -f1,2)}
7 + %define online %(case %cmsplatf in (*onl_*_*) echo true;; (*) echo false;; esac)
8  
9   Requires: expat bz2lib db4 gdbm
10  
11 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
12 < Requires: zlib openssl
11 > %if "%online" != "true"
12 > Requires: zlib openssl sqlite
13   %endif
14  
15   # FIXME: readline, crypt
16   # FIXME: gmp, panel, tk/tcl, x11
17  
18   Source0: http://www.python.org/ftp/%n/%realversion/Python-%realversion.tgz
19 < Patch0: python-Include-pyport.h
17 < Patch1: python-Lib-plat-mac-applesingle.py
18 < Patch2: python-Lib-site.py
19 < Patch3: python-Mac-OSX-Makefile
20 < Patch4: python-Makefile.pre.in
21 < Patch5: python-configure
22 < Patch6: python-setup.py
23 <
19 > Patch0: python-2.6.4-dont-detect-dbm
20  
21   %prep
22   %setup -n Python-%realversion
27 #%patch0
28 #%patch1
29 #%patch2
30 #%patch3
31 #%patch4
32 #%patch5
33 #%patch6
23   perl -p -i -e "s|#!.*/usr/local/bin/python|#!/usr/bin/env python|" Lib/cgi.py
24  
25 < %ifos darwin
26 < sed 's|@PREFIX@|%i|g' < %_sourcedir/python-osx | patch -p1
27 < %endif
25 > case %cmsplatf in
26 >  osx*)
27 >        sed 's|@PREFIX@|%i|g' < %_sourcedir/python-osx | patch -p1
28 >  ;;
29 > esac
30 > %patch0 -p1
31  
32   %build
33   # Python is awkward about passing other include or library directories
# Line 52 | Line 44 | perl -p -i -e "s|#!.*/usr/local/bin/pyth
44   #mkdir -p %i/include %i/lib
45   mkdir -p %i/include %i/lib %i/bin
46  
47 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
48 < %define extradirs $ZLIB_ROOT $OPENSSL_ROOT
47 > %if "%online" != "true"
48 > %define extradirs $ZLIB_ROOT $OPENSSL_ROOT $SQLITE_ROOT
49   %else
50   %define extradirs %{nil}
51   %endif
52  
53   dirs="$EXPAT_ROOT $BZ2LIB_ROOT $NCURSES_ROOT $DB4_ROOT $GDBM_ROOT %{extradirs}"
54  
55 + # We need to export it because setup.py now uses it to determine the actual
56 + # location of DB4, this was needed to avoid having it picked up from the system.
57 + export DB4_ROOT
58 +
59   echo $dirs
60   for d in $dirs; do
61    for f in $d/include/*; do
# Line 95 | Line 91 | esac
91   make %makeprocesses
92  
93   %install
94 + # We need to export it because setup.py now uses it to determine the actual
95 + # location of DB4, this was needed to avoid having it picked up from the system.
96 + export DB4_ROOT
97   make install
98   %define pythonv %(echo %realversion | cut -d. -f 1,2)
99  
# Line 115 | Line 114 | case %cmsplatf in
114     (cd %i/lib/python%{pythonv}/config
115      perl -p -i -e 's|-fno-common||g' Makefile)
116  
117 <   find %i/lib/python%{pythonv}/config -name 'libpython*' -exec mv {} %i/lib \;
117 >   find %i/lib/python%{pythonv}/config -name 'libpython*' -exec mv -f {} %i/lib \;
118    ;;
119   esac
120  
121   perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/idle \
122                      %{i}/bin/pydoc \
123                      %{i}/bin/python-config \
124 <                    %{i}/bin/python2.5-config \
124 >                    %{i}/bin/2to3 \
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
131 < rm  `find %{i}/lib -maxdepth 1 -mindepth 1 ! -name '*python*'`
132 < rm  `find %{i}/include -maxdepth 1 -mindepth 1 ! -name '*python*'`
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  
132 < # remove tkinter that brings dependency on libtk:
133 < #
136 <
137 < rm  `find %{i}/lib -type f -name "_tkinter.so"`
132 > find %{i}/lib -maxdepth 1 -mindepth 1 ! -name '*python*' -exec rm {} \;
133 > find %{i}/include -maxdepth 1 -mindepth 1 ! -name '*python*' -exec rm {} \;
134  
135 < # SCRAM ToolBox toolfile
136 < 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>
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>
150 < </Client>
151 < <use name=sockets>
152 < <Runtime name=PATH value="$PYTHON_BASE/bin" type=path>
153 < </Tool>
154 < EOF_TOOLFILE
135 > # remove tkinter that brings dependency on libtk:
136 > find %{i}/lib -type f -name "_tkinter.so" -exec rm {} \;
137  
138   # Makes sure that executables start with /usr/bin/env perl and not with comments.
157 find %i -type f -perm -555 -name '*.py' -exec perl -p -i -e 'if ($. == 1) {s|^"""|#/usr/bin/env python\n"""|}' {} \;
158 find %i -type f -perm -555 -name '*.py' -exec perl -p -i -e 'if ($. == 1) {s|^\'\'\'|#/usr/bin/env python\n\'\'\'|}' {} \;
159 find %i -type f -perm -555 -name '*.py' -exec perl -p -i -e 'if ($. == 1) {s|/usr/local/bin/python|/usr/bin/env python|}' {} \;
139   rm -f %i/share/doc/python/Demo/rpc/test
140  
141 + # Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment.
142 + mkdir -p %i/etc/profile.d
143 + : > %i/etc/profile.d/dependencies-setup.sh
144 + : > %i/etc/profile.d/dependencies-setup.csh
145 + for tool in $(echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'); do
146 +  root=$(echo $tool | tr a-z- A-Z_)_ROOT; eval r=\$$root
147 +  if [ X"$r" != X ] && [ -r "$r/etc/profile.d/init.sh" ]; then
148 +    echo "test X\$$root != X || . $r/etc/profile.d/init.sh" >> %i/etc/profile.d/dependencies-setup.sh
149 +    echo "test X\$$root != X || source $r/etc/profile.d/init.csh" >> %i/etc/profile.d/dependencies-setup.csh
150 +  fi
151 + done
152 +
153   %post
154 < 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
155 < %{relocateConfig}etc/scram.d/%n
154 > %{relocateConfig}lib/python2.6/config/Makefile
155 > %{relocateConfig}etc/profile.d/dependencies-setup.*sh

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines