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.32 by ratnik, Mon Oct 1 20:20:54 2007 UTC vs.
Revision 1.41 by ratnik, Tue May 13 17:29:46 2008 UTC

# Line 1 | Line 1
1 < ### RPM external python 2.4.2-CMS3q
1 > ### RPM external python 2.4.2-CMS19
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 < Requires: zlib expat openssl bz2lib db4 gdbm
5 >
6 > Requires: expat bz2lib db4 gdbm
7 >
8 > %if "%cmsplatf" != "slc4onl_ia32_gcc346"
9 > Requires: zlib openssl
10 > %endif
11 >
12   # FIXME: readline, crypt
13   # FIXME: gmp, panel, tk/tcl, x11
14  
# Line 44 | Line 50 | perl -p -i -e "s|#!.*/usr/local/bin/pyth
50   # linked specifically, or could be built by ourselves, depending on
51   # whether we like to pick up system libraries or want total control.
52   mkdir -p %i/include %i/lib
53 < dirs="$ZLIB_ROOT $EXPAT_ROOT $OPENSSL_ROOT $BZ2LIB_ROOT $NCURSES_ROOT $DB4_ROOT $GDBM_ROOT"
53 >
54 > %if "%cmsplatf" != "slc4onl_ia32_gcc346"
55 > %define extradirs $ZLIB_ROOT $OPENSSL_ROOT
56 > %else
57 > %define extradirs %{nil}
58 > %endif
59 >
60 > dirs="$EXPAT_ROOT $BZ2LIB_ROOT $NCURSES_ROOT $DB4_ROOT $GDBM_ROOT %{extradirs}"
61 >
62   echo $dirs
63   for d in $dirs; do
64    for f in $d/include/*; do
# Line 59 | Line 73 | for d in $dirs; do
73    done
74   done
75  
76 < ./configure --prefix=%i --enable-shared --without-tkinter --disable-tkinter
77 <
78 < # Link 32-bit readline library missing in the system area on 64-bit
79 < # machines:
80 <
81 < mkdir -p %{i}/lib
82 < ln -s /usr/lib/libreadline.so.4.3 %{i}/lib/libreadline.so
83 <
76 > additionalConfigureOptions=""
77 > case %cmsplatf in
78 >    osx105* )
79 >    additionalConfigureOptions="--disable-readline"
80 >    ;;
81 > esac
82 >
83 > ./configure --prefix=%i $additionalConfigureOptions --enable-shared \
84 >            --without-tkinter --disable-tkinter
85 >
86 > # The following is a kludge around the fact that the /usr/lib/libreadline.so
87 > # symlink (for 32-bit lib) is missing on the 64bit machines
88 > %if "%cmsplatf" == "slc4_ia32_gcc345"
89 >  mkdir -p %{i}/lib
90 >  ln -s /usr/lib/libreadline.so.4.3 %{i}/lib/libreadline.so
91 > %endif
92 > %if "%cmsplatf" == "slc4_ia32_gcc412"
93 >  mkdir -p %{i}/lib
94 >  ln -s /usr/lib/libreadline.so.4.3 %{i}/lib/libreadline.so
95 > %endif
96   make %makeprocesses
97  
98   %install

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines