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.37 by dlange, Tue Jun 19 05:32:13 2007 UTC vs.
Revision 1.41 by elmer, Wed Jun 27 12:50:44 2007 UTC

# Line 1 | Line 1
1 < ### RPM external xdaq 3.9.0-CMS2
2 < Requires: zlib mimetic xerces-c
1 > ### RPM external xdaq 3.9.0-CMS3
2 > Requires: zlib mimetic xerces-c uuid
3   %define xdaqv %(echo %v | cut -f1 -d- | tr . _)
4   %define libext so
5   %if "%cmsplatf" == "slc3_ia32_gcc323"
# Line 11 | Line 11 | Source0: http://switch.dl.sourceforge.ne
11   Source1: http://switch.dl.sourceforge.net/sourceforge/xdaq/powerpack_G_V1_9_0.tgz
12   Source2: http://switch.dl.sourceforge.net/sourceforge/xdaq/worksuite_G_V1_8_0.tgz
13   Patch: xdaq_39_oracle
14 + Patch1: xdaq-3.9.0-uuid
15 + Patch2: xdaq-3.9.0-nossh
16  
17   %prep
18   %setup -T -b 0 -n TriDAS
# Line 18 | Line 20 | Patch: xdaq_39_oracle
20   %setup -D -T -b 2 -n TriDAS
21  
22   #%patch0 -p2
23 + %patch1 -p1
24 + %patch2 -p1
25   ls
26   #perl -p -i -e "s|^#.*ksh(.*)|#!/usr/bin/env ksh $1|" daq/extern/SBSVME/1003/v2p3p0/sys/makefile \
27   #                                                     daq/extern/SBSVME/1003/v2p3p0/sys/mkbtp
# Line 36 | Line 40 | export XDAQ_ROOT=$PWD
40   cd %{i}/daq
41   export MIMETIC_PREFIX=$MIMETIC_ROOT
42   export XERCES_PREFIX=$XERCES_C_ROOT
43 + export UUID_LIB_PREFIX=$UUID_ROOT/lib
44  
45   make CPPDEFINES=linux Set=extern_coretools install
46   make CPPDEFINES=linux Set=coretools install
47   make CPPDEFINES=linux Set=extern_powerpack install
48   make CPPDEFINES=linux Set=powerpack install
49   cd xdaq2rc
50 < make
50 > make CPPDEFINES=linux install
51   cd ..
52  
53  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines