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.250 by elmer, Mon Feb 28 00:17:30 2011 UTC vs.
Revision 1.265 by muzaffar, Mon May 23 13:40:53 2011 UTC

# Line 5 | Line 5
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 false;; esac)
8 < %define ismac %(case %cmsplatf in osx*%closingbrace echo true;; *%closingbrace e
9 < cho false;; esac)
8 > %define ismac %(case %cmsplatf in osx*%closingbrace echo true;; *%closingbrace echo false;; esac)
9  
10   Patch0: root-5.27-06-externals
11   Patch1: root-5.27-04-CINT-maxlongline-maxtypedef
# Line 36 | Line 35 | Patch24: root-5.27-06b-r38023
35   Patch25: root-5.27-06b-r36708
36   Patch26: root-5.27-06b-r38126-r38156
37   Patch27: root-5.27-06b-r38210
38 + Patch28: root-5.27-06b-r38248-r38252-r38259-r38264-r38265-r38267
39 + Patch29: root-5.27-06b-gcc46
40 + Patch30: root-5.27-06b-r38325
41 + Patch31: root-5.27-06b-tmva-MethodANNBase-uninitialized-var-fix
42 + Patch32: root-5.27-06b-r36196-r36698
43 + Patch33: root-5.27-06-fireworks11
44 + Patch34: root-5.27-06b-r38369
45 + Patch35: root-5.27-06b-r39055
46 + Patch36: root-5.27.06b-r39155
47  
48   %define cpu %(echo %cmsplatf | cut -d_ -f2)
49  
# Line 53 | Line 61 | Requires: openssl zlib xrootd
61   Requires: gfortran-macosx
62   %endif
63  
56 – %if "%online" != "true"
57 – %if "%ismac" != "true"
58 – Requires: qt
59 – %endif
60 – %endif
61 –
64   %prep
65   %setup -n root
66   %patch0 -p1
# Line 89 | Line 91 | Requires: qt
91   %patch25 -p1
92   %patch26 -p1
93   %patch27 -p1
94 + %patch28 -p1
95 + %patch29 -p1
96 + %patch30 -p1
97 + %patch31 -p1
98 + %patch32 -p1
99 + %patch33 -p1
100 + %patch34 -p1
101 + %patch35 -p1
102 + %patch36 -p1
103  
104   # The following patch can only be applied on SLC5 or later (extra linker
105   # options only available with the SLC5 binutils)
# Line 110 | Line 121 | export ROOTSYS=%_builddir/root
121   export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
122  
123   %if "%online" == "true"
124 < # Use system qt. Also skip xrootd and odbc for online case:
124 > # Also skip xrootd and odbc for online case:
125  
126   EXTRA_CONFIG_ARGS="--with-f77=/usr
127 <             --disable-odbc
117 <             --disable-qt --disable-qtgsi --disable-astiff"
127 >             --disable-odbc --disable-astiff"
128   %else
129   export LIBPNG_ROOT ZLIB_ROOT LIBTIFF_ROOT LIBUNGIF_ROOT
130   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
121 –             --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
131               --with-ssl-incdir=${OPENSSL_ROOT}/include
132 <             --with-ssl-libdir=${OPENSSL_ROOT}/lib
124 <             --enable-qtgsi"
132 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
133   %endif
134  
135   CONFIG_ARGS="--enable-table
# Line 147 | Line 155 | CONFIG_ARGS="--enable-table
155               --with-dcap-incdir=${DCAP_ROOT}/include
156               --disable-pgsql
157               --disable-mysql
158 +             --disable-qt --disable-qtgsi
159               --disable-oracle ${EXTRA_CONFIG_ARGS}"
160  
161   case %cmsos in

Diff Legend

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