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.85 by elmer, Thu Jan 3 14:41:10 2008 UTC vs.
Revision 1.93 by elmer, Fri Jan 18 21:22:01 2008 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.17.08-CMS19
1 > ### RPM lcg root 5.18.00-CMS19
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 < #Patch: root-CINT-maxlongline
8 < #Patch1: root_libpng
9 < #Patch2: root_PositionVector
10 < #Patch3: root-fastmerge-ttree
11 < #Patch4: root_TXMLSetup
12 < #Patch5: root-Cintex
13 < #Patch6: root_Reflex_Cintex
14 < #Patch7: root_CallFunc
15 < ## The following patch should only be applied for gcc4.x (x>0) and when
16 < ## using gccxml 0.7.0
17 < #Patch9: root_5.14_reflex_gccxml070_update
18 < #Patch10: root-5.14-xrootd-20071001-0000a
19 < #Patch11: root-5.14-silence-tmva
7 > Patch0: root-5.18-00-libpng
8 > Patch1: root-5.18-00-CINT-maxlongline
9  
10   %define cpu %(echo %cmsplatf | cut -d_ -f2)
11   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
# Line 28 | Line 17 | Requires: libtiff
17  
18   %prep
19   %setup -n root
20 < #%patch -p0
21 < #%patch1 -p2
33 < #%patch2 -p2
34 < #%patch3 -p1
35 < #%patch4 -p0
36 < #%patch5 -p1
37 < #%patch6 -p0
38 < #%patch7 -p0
39 < #%if "%cmsplatf" == "slc4_ia32_gcc412"
40 < #%patch9 -p1
41 < #%endif
42 < #%patch10 -p1
43 < #%patch11 -p1
20 > %patch0 -p1
21 > %patch1 -p1
22  
23   %build
24   mkdir -p %i
# Line 73 | Line 51 | CONFIG_ARGS="--enable-table
51               --disable-pgsql
52               --disable-xml"
53  
54 < %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_amd64_gcc345"))
54 > %if (("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422")||("%cmsplatf" == "slc4_amd64_gcc345"))
55    CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
56   %endif
57  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines