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.127 by elmer, Mon Nov 24 22:17:44 2008 UTC vs.
Revision 1.129 by elmer, Thu Jan 1 12:52:18 2009 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.21.04
1 > ### RPM lcg root 5.18.00a
2   ## INITENV +PATH PYTHONPATH %i/lib/python
3   ## INITENV SET ROOTSYS %i
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  
7   Patch0:  root-5.18-00-libpng
8 < Patch1:  root-5.21-04-CINT-maxlongline
9 < #Patch2:  root_5.18-00-CINTFunctional
10 < #Patch3:  root-5.18-00a-TBufferXML
11 < #Patch4:  root-5.18-00a-Cintex
12 < #Patch5:  root-5.18-00a-Cintex2
13 < #Patch6:  root-5.18-00a-TBufferFile
14 < #Patch7:  root-5.18-00a-cintexquickfix2
15 < #Patch8:  root-5.18-00a-gendict-performance
16 < #Patch9:  root-5.18-00a-TClass-classNameSize
17 < #Patch10: root-5.18-00a-TFile-stlStreamerInfo
18 < #Patch11: root-5.18-00-cintex_functional_mmap
8 > Patch1:  root-5.18-00a-CINT-maxlongline
9 > Patch2:  root_5.18-00-CINTFunctional
10 > Patch3:  root-5.18-00a-TBufferXML
11 > Patch4:  root-5.18-00a-Cintex
12 > Patch5:  root-5.18-00a-Cintex2
13 > Patch6:  root-5.18-00a-TBufferFile
14 > Patch7:  root-5.18-00a-cintexquickfix2
15 > Patch8:  root-5.18-00a-gendict-performance
16 > Patch9:  root-5.18-00a-TClass-classNameSize
17 > Patch10: root-5.18-00a-TFile-stlStreamerInfo
18 > Patch11: root-5.18-00-cintex_functional_mmap
19 > Patch12: root-5.18-00a-TMVA-fSilent
20 > Patch13: root-5.18.00a-TClass-custom-streamer
21  
22   %define cpu %(echo %cmsplatf | cut -d_ -f2)
23   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 23 | Line 25 | Patch1:  root-5.21-04-CINT-maxlongline
25   Requires: gccxml gsl castor libjpg dcap pcre python
26  
27   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
28 < Requires: qt openssl mysql libpng zlib libungif
28 > Requires: qt openssl mysql libpng zlib libungif xrootd
29   %else
30   %define skiplibtiff true
31   %endif
# Line 40 | Line 42 | Requires: libtiff
42   %setup -n root
43   %patch0 -p1
44   %patch1 -p1
45 < #%patch2 -p0
46 < #%patch3 -p1
47 < #%patch4 -p0
48 < #%patch5 -p0
49 < #%patch6 -p0
50 < #%patch7 -p0
51 < #%patch8 -p1
52 < #%patch9 -p0
53 < #%patch10 -p0
54 < #%patch11 -p0
45 > %patch2 -p0
46 > %patch3 -p1
47 > %patch4 -p0
48 > %patch5 -p0
49 > %patch6 -p0
50 > %patch7 -p0
51 > %patch8 -p1
52 > %patch9 -p0
53 > %patch10 -p0
54 > %patch11 -p0
55 > %patch12 -p1
56 > %patch13 -p1
57  
58   %build
59   mkdir -p %i
# Line 66 | Line 70 | EXTRA_CONFIG_ARGS="
70               --enable-qt"
71   %else
72   EXTRA_CONFIG_ARGS="
73 +             --with-xrootd=$XROOTD_ROOT
74               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
75               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
76               --with-ssl-incdir=${OPENSSL_ROOT}/include
77               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
78   %endif
79  
80 < CONFIG_ARGS="--with-f77=${GCC_ROOT}
76 <             --enable-table
80 > CONFIG_ARGS="--enable-table
81               --disable-builtin-pcre
82               --disable-builtin-freetype
83               --disable-builtin-zlib
# Line 81 | Line 85 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
85               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
86               --enable-explicitlink
87               --enable-qtgsi
88 +             --enable-mathcore
89               --enable-mathmore
90               --enable-reflex  
91               --enable-cintex
# Line 95 | Line 100 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
100               --disable-pgsql
101               --disable-xml ${EXTRA_CONFIG_ARGS}"
102  
103 < #case %gccver in
104 < #  4.*)
105 < #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
101 < #  ;;
102 < #esac
103 > %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
104 >  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
105 > %endif
106  
107   case $(uname)-$(uname -p) in
108    Linux-x86_64)
# Line 129 | Line 132 | fi
132   export ROOTSYS=%i
133   make INSTALL="$cp" INSTALLDATA="$cp" install
134   mkdir -p $ROOTSYS/lib/python
135 < cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
135 > cp -r reflex/python/genreflex $ROOTSYS/lib/python
136   #
137  
138   # SCRAM ToolBox toolfile

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines