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.52 by elmer, Thu Sep 3 20:05:08 2009 UTC vs.
Revision 1.72 by lat, Mon May 23 16:02:21 2011 UTC

# Line 1 | Line 1
1 < ### RPM external python 2.4.2-CMS19
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 flase;; esac)
6 > %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
7  
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
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
19 < Patch1: python-Lib-plat-mac-applesingle.py
20 < Patch2: python-Lib-site.py
21 < Patch3: python-Mac-OSX-Makefile
22 < Patch4: python-Makefile.pre.in
23 < Patch5: python-configure
24 < Patch6: python-setup.py
25 <
18 > Patch0: python-2.6.4-dont-detect-dbm
19  
20   %prep
21   %setup -n Python-%realversion
29 #%patch0
30 #%patch1
31 #%patch2
32 #%patch3
33 #%patch4
34 #%patch5
35 #%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 51 | 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 "%online" != "true"
47 < %define extradirs $ZLIB_ROOT $OPENSSL_ROOT
47 > %define extradirs $ZLIB_ROOT $OPENSSL_ROOT $SQLITE_ROOT
48   %else
49   %define extradirs %{nil}
50   %endif
51  
52   dirs="$EXPAT_ROOT $BZ2LIB_ROOT $NCURSES_ROOT $DB4_ROOT $GDBM_ROOT %{extradirs}"
53  
54 + # We need to export it because setup.py now uses it to determine the actual
55 + # location of DB4, this was needed to avoid having it picked up from the system.
56 + export DB4_ROOT
57 +
58   echo $dirs
59   for d in $dirs; do
60    for f in $d/include/*; do
# Line 87 | Line 81 | esac
81  
82   # The following is a kludge around the fact that the /usr/lib/libreadline.so
83   # symlink (for 32-bit lib) is missing on the 64bit machines
84 < %if "%cmsplatf" == "slc4_ia32_gcc345"
85 <  mkdir -p %{i}/lib
86 <  ln -s /usr/lib/libreadline.so.4.3 %{i}/lib/libreadline.so
87 < %endif
88 < %if "%cmsplatf" == "slc4_ia32_gcc412"
89 <  mkdir -p %{i}/lib
96 <  ln -s /usr/lib/libreadline.so.4.3 %{i}/lib/libreadline.so
97 < %endif
84 > case %cmsplatf in
85 >  slc4_ia32* )
86 >    mkdir -p %{i}/lib
87 >    ln -s /usr/lib/libreadline.so.4.3 %{i}/lib/libreadline.so
88 >  ;;
89 > esac
90   make %makeprocesses
91  
92   %install
93 + # We need to export it because setup.py now uses it to determine the actual
94 + # location of DB4, this was needed to avoid having it picked up from the system.
95 + export DB4_ROOT
96   make install
97   %define pythonv %(echo %realversion | cut -d. -f 1,2)
98  
99 < #if [ $(uname) = Darwin ]; then
100 <  # make install prefix=%i
101 <  # (cd Misc; /bin/rm -rf RPM)
102 <  # mkdir -p %i/share/doc/%n
103 <  # cp -R Demo Doc %i/share/doc/%n
104 <  # cp -R Misc Tools %i/lib/python%{pythonv}
105 < #  gcc -dynamiclib -all_load -single_module \
106 < #    -framework System -framework CoreServices -framework Foundation \
107 < #    %i/lib/python%{pythonv}/config/libpython%{pythonv}.a \
108 < #    -undefined dynamic_lookup \
109 < #    -o %i/lib/python%{pythonv}/config/libpython%{pythonv}.dylib \
110 < #    -install_name %i/lib/python%{pythonv}/config/libpython%{pythonv}.dylib \
111 < #    -current_version %{pythonv} -compatibility_version %{pythonv} -ldl
112 < #  ln -s libpython%{pythonv}.dylib %i/lib/python%{pythonv}/config/libpython%{pythonv}.dylib # for boost
113 <  # (cd %i/lib/python%{pythonv}/config; mv Makefile Makefile.orig;
114 <  #  sed 's|-fno-common||g' < Makefile.orig > Makefile; /bin/rm -f Makefile.orig)
115 < #fi
99 > case %cmsplatf in
100 >  osx*)
101 >   make install prefix=%i
102 >   (cd Misc; /bin/rm -rf RPM)
103 >   mkdir -p %i/share/doc/%n
104 >   cp -R Demo Doc %i/share/doc/%n
105 >   cp -R Misc Tools %i/lib/python%{pythonv}
106 >   gcc -dynamiclib -all_load -single_module \
107 >    -framework System -framework CoreServices -framework Foundation \
108 >    %i/lib/python%{pythonv}/config/libpython%{pythonv}.a \
109 >    -undefined dynamic_lookup \
110 >    -o %i/lib/python%{pythonv}/config/libpython%{pythonv}.dylib \
111 >    -install_name %i/lib/python%{pythonv}/config/libpython%{pythonv}.dylib \
112 >    -current_version %{pythonv} -compatibility_version %{pythonv} -ldl
113 >   (cd %i/lib/python%{pythonv}/config
114 >    perl -p -i -e 's|-fno-common||g' Makefile)
115 >
116 >   find %i/lib/python%{pythonv}/config -name 'libpython*' -exec mv -f {} %i/lib \;
117 >  ;;
118 > esac
119  
120   perl -p -i -e "s|^#!.*python|#!/usr/bin/env python|" %{i}/bin/idle \
121                      %{i}/bin/pydoc \
122 +                    %{i}/bin/python-config \
123 +                    %{i}/bin/2to3 \
124 +                    %{i}/bin/python2.6-config \
125                      %{i}/bin/smtpd.py \
126 <                    %{i}/lib/python2.4/bsddb/dbshelve.py \
127 <                    %{i}/lib/python2.4/test/test_bz2.py \
128 <                    %{i}/lib/python2.4/test/test_largefile.py \
129 <                    %{i}/lib/python2.4/test/test_optparse.py
130 < # boost.spec rfio.spec
131 < #
132 < #
132 < rm  `find %{i}/lib -maxdepth 1 -mindepth 1 ! -name '*python*'`
133 < rm  `find %{i}/include -maxdepth 1 -mindepth 1 ! -name '*python*'`
126 >                    %{i}/lib/python2.6/bsddb/dbshelve.py \
127 >                    %{i}/lib/python2.6/test/test_bz2.py \
128 >                    %{i}/lib/python2.6/test/test_largefile.py \
129 >                    %{i}/lib/python2.6/test/test_optparse.py
130 >
131 > find %{i}/lib -maxdepth 1 -mindepth 1 ! -name '*python*' -exec rm {} \;
132 > find %{i}/include -maxdepth 1 -mindepth 1 ! -name '*python*' -exec rm {} \;
133  
135 %if "%online" == "true"
134   # remove tkinter that brings dependency on libtk:
135 < rm  `find %{i}/lib -type f -name "_tkinter.so"`
138 < %endif
135 > find %{i}/lib -type f -name "_tkinter.so" -exec rm {} \;
136  
137 < # SCRAM ToolBox toolfile
138 < mkdir -p %i/etc/scram.d
139 < cat << \EOF_TOOLFILE >%i/etc/scram.d/%n
140 < <doc type=BuildSystem::ToolDoc version=1.0>
141 < <Tool name=%n version=%v>
142 < <lib name=python2.4>
143 < <Client>
144 < <Environment name=PYTHON_BASE default="%i"></Environment>
145 < <Environment name=LIBDIR default="$PYTHON_BASE/lib"></Environment>
146 < <Environment name=INCLUDE default="$PYTHON_BASE/include/python2.4"></Environment>
147 < <Environment name=PYTHON_COMPILE default="$PYTHON_BASE/lib/python2.4/compileall.py"></Environment>
148 < </Client>
149 < <use name=sockets>
150 < <Runtime name=PYTHONHOME value="$PYTHON_BASE">
154 < <Runtime name=PATH value="$PYTHON_BASE/bin" type=path>
155 < </Tool>
156 < EOF_TOOLFILE
137 > # Makes sure that executables start with /usr/bin/env perl and not with comments.
138 > rm -f %i/share/doc/python/Demo/rpc/test
139 >
140 > # Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment.
141 > mkdir -p %i/etc/profile.d
142 > : > %i/etc/profile.d/dependencies-setup.sh
143 > : > %i/etc/profile.d/dependencies-setup.csh
144 > for tool in $(echo %{requiredtools} | sed -e's|\s+| |;s|^\s+||'); do
145 >  root=$(echo $tool | tr a-z- A-Z_)_ROOT; eval r=\$$root
146 >  if [ X"$r" != X ] && [ -r "$r/etc/profile.d/init.sh" ]; then
147 >    echo "test X\$$root != X || . $r/etc/profile.d/init.sh" >> %i/etc/profile.d/dependencies-setup.sh
148 >    echo "test X\$$root != X || source $r/etc/profile.d/init.csh" >> %i/etc/profile.d/dependencies-setup.csh
149 >  fi
150 > done
151  
152   %post
153 < 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
154 < %{relocateConfig}etc/scram.d/%n
153 > %{relocateConfig}lib/python2.6/config/Makefile
154 > %{relocateConfig}etc/profile.d/dependencies-setup.*sh

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines