ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/xdaq.spec
(Generate patch)

Comparing COMP/CMSDIST/xdaq.spec (file contents):
Revision 1.70 by muzaffar, Tue Jan 12 13:59:38 2010 UTC vs.
Revision 1.73 by muzaffar, Fri Feb 5 16:31:38 2010 UTC

# Line 1 | Line 1
1 < ### RPM external xdaq VR15544
1 > ### RPM external xdaq VR16021
2   ## BUILDIF case $(uname):$(uname -p) in Linux:i*86 ) true ;; Linux:x86_64 ) true ;;  Linux:ppc64 ) false ;; Darwin:* ) false ;; * ) false ;; esac
3  
4   Requires: zlib mimetic xerces-c uuid sqlite
5   %define xdaqv %(echo %v | cut -f1 -d- | tr . _)
6   %define libext so
7 + %define svntrunk  %(echo %v | sed 's|^VR||')
8 + Source: svn://svn.cern.ch/reps/cmsos/releases/baseline10/tags/base/?scheme=svn+ssh&revision=%svntrunk&strategy=export&module=xdaq&output=/xdaq.tar.gz
9  
10 < Source: svn://svn.cern.ch/reps/cmsos/releases/baseline9/trunk/?scheme=svn+ssh&revision=15544&strategy=export&module=xdaq&output=/xdaq.tar.gz
9 <
10 < Patch0: xdaq_build
10 > Patch0: xdaq_VR16021_build
11   Patch1: xdaq_mfDefs_flags
12   Patch2: xdaq_VR15544_gcc44
13  
# Line 17 | Line 17 | Provides: /bin/awk
17   %setup -T -b 0 -n xdaq
18  
19   %patch0 -p1
20 < %patch1 -p4
20 > %patch1 -p1
21   %patch2 -p1
22  
23   %build
# Line 42 | Line 42 | make CPPDEFINES=linux Set=extern_coretoo
42   make CPPDEFINES=linux Set=coretools install
43   make CPPDEFINES=linux Set=extern_powerpack install
44   make CPPDEFINES=linux Set=powerpack install
45 < cd xdaq2rc
46 < make CPPDEFINES=linux install
45 > make CPPDEFINES=linux Set=general_worksuite install
46  
47   # The following structure used as defined in Xdaq "simplify" script:
48   cd %{i}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines