ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/root.spec
(Generate patch)

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.178 by elmer, Mon Sep 21 14:58:38 2009 UTC vs.
Revision 1.180 by elmer, Tue Nov 3 14:17:05 2009 UTC

# Line 4 | Line 4
4   #Source: cvs://:pserver:cvs@root.cern.ch:2401/user/cvs?passwd=Ah<Z&tag=-rv%(echo %realversion | tr . -)&module=root&output=/%{n}_v%{realversion}.source.tar.gz
5   Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6   %define closingbrace )
7 < %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo flase;; esac)
7 > %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
8  
9   Patch0:  root-5.18-00-libpng
10   Patch1:  root-5.21-04-CINT-maxlongline
# Line 24 | Line 24 | Patch14: root-5.22-00a-fireworks4
24   Patch15: root-5.22-00d-fireworks5
25  
26   %define cpu %(echo %cmsplatf | cut -d_ -f2)
27 %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
27  
28   Requires: gccxml gsl castor libjpg dcap pcre python
29  
# Line 84 | Line 83 | esac
83  
84   mkdir -p %i
85   export ROOTSYS=%_builddir/root
86 + export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
87  
88   %if "%online" == "true"
89   # Build without mysql, and use system qt.
# Line 109 | Line 109 | CONFIG_ARGS="--enable-table
109               --disable-builtin-freetype
110               --disable-builtin-zlib
111               --with-gccxml=${GCCXML_ROOT}
112 <             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
112 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python${PYTHONV}
113               --enable-explicitlink
114               --enable-mathmore
115               --enable-reflex  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines