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.128 by elmer, Tue Dec 16 01:51:29 2008 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  
21   %define cpu %(echo %cmsplatf | cut -d_ -f2)
22   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 23 | Line 24 | Patch1:  root-5.21-04-CINT-maxlongline
24   Requires: gccxml gsl castor libjpg dcap pcre python
25  
26   %if "%cmsplatf" != "slc4onl_ia32_gcc346"
27 < Requires: qt openssl mysql libpng zlib libungif
27 > Requires: qt openssl mysql libpng zlib libungif xrootd
28   %else
29   %define skiplibtiff true
30   %endif
# Line 40 | Line 41 | Requires: libtiff
41   %setup -n root
42   %patch0 -p1
43   %patch1 -p1
44 < #%patch2 -p0
45 < #%patch3 -p1
46 < #%patch4 -p0
47 < #%patch5 -p0
48 < #%patch6 -p0
49 < #%patch7 -p0
50 < #%patch8 -p1
51 < #%patch9 -p0
52 < #%patch10 -p0
53 < #%patch11 -p0
44 > %patch2 -p0
45 > %patch3 -p1
46 > %patch4 -p0
47 > %patch5 -p0
48 > %patch6 -p0
49 > %patch7 -p0
50 > %patch8 -p1
51 > %patch9 -p0
52 > %patch10 -p0
53 > %patch11 -p0
54 > %patch12 -p1
55  
56   %build
57   mkdir -p %i
# Line 66 | Line 68 | EXTRA_CONFIG_ARGS="
68               --enable-qt"
69   %else
70   EXTRA_CONFIG_ARGS="
71 +             --with-xrootd=$XROOTD_ROOT
72               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
73               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
74               --with-ssl-incdir=${OPENSSL_ROOT}/include
75               --with-ssl-libdir=${OPENSSL_ROOT}/lib"
76   %endif
77  
78 < CONFIG_ARGS="--with-f77=${GCC_ROOT}
76 <             --enable-table
78 > CONFIG_ARGS="--enable-table
79               --disable-builtin-pcre
80               --disable-builtin-freetype
81               --disable-builtin-zlib
# Line 81 | Line 83 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
83               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
84               --enable-explicitlink
85               --enable-qtgsi
86 +             --enable-mathcore
87               --enable-mathmore
88               --enable-reflex  
89               --enable-cintex
# Line 95 | Line 98 | CONFIG_ARGS="--with-f77=${GCC_ROOT}
98               --disable-pgsql
99               --disable-xml ${EXTRA_CONFIG_ARGS}"
100  
101 < #case %gccver in
102 < #  4.*)
103 < #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
101 < #  ;;
102 < #esac
101 > %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
102 >  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
103 > %endif
104  
105   case $(uname)-$(uname -p) in
106    Linux-x86_64)
# Line 129 | Line 130 | fi
130   export ROOTSYS=%i
131   make INSTALL="$cp" INSTALLDATA="$cp" install
132   mkdir -p $ROOTSYS/lib/python
133 < cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
133 > cp -r reflex/python/genreflex $ROOTSYS/lib/python
134   #
135  
136   # SCRAM ToolBox toolfile

Diff Legend

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