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.44 by eulisse, Thu Feb 26 11:21:46 2009 UTC vs.
Revision 1.69 by eulisse, Thu Sep 16 09:22:00 2010 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   # OS X patches and build fudging stolen from fink
5 + %define closingbrace )
6 + %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
7  
8   Requires: expat bz2lib db4 gdbm
9  
10 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
11 < Requires: zlib openssl
10 > %if "%online" != "true"
11 > Requires: zlib openssl sqlite
12   %endif
13  
14   # FIXME: readline, crypt
15   # FIXME: gmp, panel, tk/tcl, x11
16  
17   Source0: http://www.python.org/ftp/%n/%realversion/Python-%realversion.tgz
18 < 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 <
18 > Patch0: python-2.6.4-dont-detect-dbm
19  
20   %prep
21   %setup -n Python-%realversion
27 #%patch0
28 #%patch1
29 #%patch2
30 #%patch3
31 #%patch4
32 #%patch5
33 #%patch6
22   perl -p -i -e "s|#!.*/usr/local/bin/python|#!/usr/bin/env python|" Lib/cgi.py
23  
24 < %ifos darwin
25 < sed 's|@PREFIX@|%i|g' < %_sourcedir/python-osx | patch -p1
26 < %endif
24 > case %cmsplatf in
25 >  osx*)
26 >        sed 's|@PREFIX@|%i|g' < %_sourcedir/python-osx | patch -p1
27 >  ;;
28 > esac
29 > %patch0 -p1
30  
31   %build
32   # Python is awkward about passing other include or library directories
# Line 49 | Line 40 | perl -p -i -e "s|#!.*/usr/local/bin/pyth
40   # see above for the commented-out list of packages that could be
41   # linked specifically, or could be built by ourselves, depending on
42   # whether we like to pick up system libraries or want total control.
43 < mkdir -p %i/include %i/lib
43 > #mkdir -p %i/include %i/lib
44 > mkdir -p %i/include %i/lib %i/bin
45  
46 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
47 < %define extradirs $ZLIB_ROOT $OPENSSL_ROOT
46 > %if "%online" != "true"
47 > %define extradirs $ZLIB_ROOT $OPENSSL_ROOT $SQLITE_ROOT
48   %else
49   %define extradirs %{nil}
50   %endif
# Line 114 | Line 106 | case %cmsplatf in
106     (cd %i/lib/python%{pythonv}/config
107      perl -p -i -e 's|-fno-common||g' Makefile)
108  
109 <   find %i/lib/python%{pythonv}/config -name 'libpython*' -exec mv {} %i/lib \;
109 >   find %i/lib/python%{pythonv}/config -name 'libpython*' -exec mv -f {} %i/lib \;
110    ;;
111   esac
112  
113   perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/idle \
114                      %{i}/bin/pydoc \
115 +                    %{i}/bin/python-config \
116 +                    %{i}/bin/2to3 \
117 +                    %{i}/bin/python2.6-config \
118                      %{i}/bin/smtpd.py \
119 <                    %{i}/lib/python2.4/bsddb/dbshelve.py \
120 <                    %{i}/lib/python2.4/test/test_bz2.py \
121 <                    %{i}/lib/python2.4/test/test_largefile.py \
122 <                    %{i}/lib/python2.4/test/test_optparse.py
128 < rm  `find %{i}/lib -maxdepth 1 -mindepth 1 ! -name '*python*'`
129 < rm  `find %{i}/include -maxdepth 1 -mindepth 1 ! -name '*python*'`
119 >                    %{i}/lib/python2.6/bsddb/dbshelve.py \
120 >                    %{i}/lib/python2.6/test/test_bz2.py \
121 >                    %{i}/lib/python2.6/test/test_largefile.py \
122 >                    %{i}/lib/python2.6/test/test_optparse.py
123  
124 < # remove tkinter that brings dependency on libtk:
125 < #
133 <
134 < rm  `find %{i}/lib -type f -name "_tkinter.so"`
124 > find %{i}/lib -maxdepth 1 -mindepth 1 ! -name '*python*' -exec rm {} \;
125 > find %{i}/include -maxdepth 1 -mindepth 1 ! -name '*python*' -exec rm {} \;
126  
127 < # SCRAM ToolBox toolfile
128 < mkdir -p %i/etc/scram.d
138 < cat << \EOF_TOOLFILE >%i/etc/scram.d/%n
139 < <doc type=BuildSystem::ToolDoc version=1.0>
140 < <Tool name=%n version=%v>
141 < <lib name=python2.4>
142 < <Client>
143 < <Environment name=PYTHON_BASE default="%i"></Environment>
144 < <Environment name=LIBDIR default="$PYTHON_BASE/lib"></Environment>
145 < <Environment name=INCLUDE default="$PYTHON_BASE/include/python2.4"></Environment>
146 < <Environment name=PYTHON_COMPILE default="$PYTHON_BASE/lib/python2.4/compileall.py"></Environment>
147 < </Client>
148 < <use name=sockets>
149 < <Runtime name=PATH value="$PYTHON_BASE/bin" type=path>
150 < </Tool>
151 < EOF_TOOLFILE
127 > # remove tkinter that brings dependency on libtk:
128 > find %{i}/lib -type f -name "_tkinter.so" -exec rm {} \;
129  
130   # Makes sure that executables start with /usr/bin/env perl and not with comments.
131   find %i -type f -perm -555 -name '*.py' -exec perl -p -i -e 'if ($. == 1) {s|^"""|#/usr/bin/env python\n"""|}' {} \;
# Line 156 | Line 133 | find %i -type f -perm -555 -name '*.py'
133   find %i -type f -perm -555 -name '*.py' -exec perl -p -i -e 'if ($. == 1) {s|/usr/local/bin/python|/usr/bin/env python|}' {} \;
134   rm -f %i/share/doc/python/Demo/rpc/test
135  
136 + # Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment.
137 + mkdir -p %i/etc/profile.d
138 + : > %i/etc/profile.d/dependencies-setup.sh
139 + : > %i/etc/profile.d/dependencies-setup.csh
140 + for tool in $(echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'); do
141 +  root=$(echo $tool | tr a-z- A-Z_)_ROOT; eval r=\$$root
142 +  if [ X"$r" != X ] && [ -r "$r/etc/profile.d/init.sh" ]; then
143 +    echo "test X\$$root != X || . $r/etc/profile.d/init.sh" >> %i/etc/profile.d/dependencies-setup.sh
144 +    echo "test X\$$root != X || source $r/etc/profile.d/init.csh" >> %i/etc/profile.d/dependencies-setup.csh
145 +  fi
146 + done
147 +
148   %post
149 < 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
150 < %{relocateConfig}etc/scram.d/%n
149 > %{relocateConfig}lib/python2.6/config/Makefile
150 > %{relocateConfig}etc/profile.d/dependencies-setup.*sh

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines