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

Comparing COMP/CMSDIST/geant4.spec (file contents):
Revision 1.107 by muzaffar, Mon Oct 3 11:51:37 2011 UTC vs.
Revision 1.115 by davidlt, Wed Apr 4 08:05:46 2012 UTC

# Line 1 | Line 1
1 < ### RPM external geant4 9.3.p01
1 > ### RPM external geant4 9.4.p03
2   %define downloadv %(echo %v | cut -d- -f1)
3  
4   Requires: clhep
5  
6   Source0: http://geant4.cern.ch/support/source/%n.%downloadv.tar.gz
7  
8 < Patch0:  geant-4.8.2.p01-nobanner
9 < Patch1: geant4.9.3.p01-G4CascadeInterface
8 > Patch0: geant-4.8.2.p01-nobanner
9 > Patch1: geant4-9.4.p03-fix-anti-proton-bug
10 > Patch2: geant4-9.4.p03-use-CXXFLAGS-env-variable
11 >
12 > %if "%{?cms_cxxflags:set}" != "set"
13 > %define cms_cxxflags -std=c++0x -O2
14 > %endif
15  
16   %prep
17   %setup -n %n.%downloadv
18  
19   %patch0 -p1
20 < %patch1 -p1
21 <
20 > %patch1 -p1
21 > %patch2 -p1
22 >
23   %build
24   if [ $(uname) = Darwin ]; then
25    export MACOSX_DEPLOYMENT_TARGET="10.4"
# Line 21 | Line 27 | fi
27  
28   # Linux? -pthread?
29   touch G4BuildConf.sh
30 + echo "export CXXFLAGS='%{cms_cxxflags}'" >> G4BuildConf.sh
31   echo "export OS_ARCH=%{cmsplatf}" >> G4BuildConf.sh
32   #FIXME: is this correct???
33   echo "export G4SYSTEM=$(uname)-g++" >> G4BuildConf.sh
# Line 64 | Line 71 | echo "export G4VIS_BUILD_DAWNFILE_DRIVER
71   # echo "export G4VIS_BUILD_VRML_DRIVER=1" >> G4BuildConf.sh
72   # echo "export G4VIS_BUILD_RAYTRACER_DRIVER=1" >> G4BuildConf.sh
73   # export G4LIB_BUILD_G3TOG4=1
74 < source G4BuildConf.sh
74 > source ./G4BuildConf.sh
75   mkdir -p %i
76   tar -cf - config source | tar -C %i -xf -
77  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines