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

Comparing COMP/CMSDIST/java-jdk.spec (file contents):
Revision 1.11 by muzaffar, Mon Sep 3 15:28:45 2007 UTC vs.
Revision 1.16 by valya, Wed Sep 10 13:27:39 2008 UTC

# Line 1 | Line 1
1 < ### RPM external java-jdk 1.5.0.p6
1 > ### RPM external java-jdk 1.5.0_15
2   ## BUILDIF [ "$(uname)" != "Darwin" ]
3  
4   Provides: libasound.so.2
# Line 7 | Line 7 | Provides: libjava_crw_demo_g.so
7   Provides: libodbc.so
8   Provides: libodbcinst.so
9  
10 < %define downloadv %(echo %v | tr '.p' '_0')
10 > %define downloadv %(echo %realversion | tr '.p' '_0')
11  
12   %define tmpArch %(echo %cmsplatf | cut -d_ -f 1,2)
13  
# Line 24 | Line 24 | Provides: libodbcinst.so
24   %define downloadarch amd64
25   %endif
26  
27 < Source0: http://eulisse.web.cern.ch/eulisse/jdk-%downloadv-linux-i586.bin
28 < Source1: http://eulisse.web.cern.ch/eulisse/jdk-%downloadv-linux-amd64.bin
27 > %if "%{tmpArch}" == "slc4_amd64"
28 > %define downloadarch amd64
29 > %endif
30 >
31 > Source0: http://cmsrep.cern.ch/cmssw/jdk-mirror/jdk-%downloadv-linux-i586.bin
32 > Source1: http://cmsrep.cern.ch/cmssw/jdk-mirror/jdk-%downloadv-linux-amd64.bin
33  
34   %prep
35   %if %(uname) != Darwin
36   ls
37 < %define javadir jdk%(echo %v| sed -e "s/.p/_0/")
37 > %define javadir jdk%(echo %realversion| sed -e "s/.p/_0/")
38   rm -rf %javadir
39   yes | sh %{_sourcedir}/jdk-%downloadv-linux-%downloadarch.bin
40   cd %javadir

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines