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.125 by elmer, Tue Oct 28 13:00:24 2008 UTC vs.
Revision 1.127 by elmer, Mon Nov 24 22:17:44 2008 UTC

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

Diff Legend

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