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.2 by eulisse, Wed Apr 5 15:51:49 2006 UTC vs.
Revision 1.15 by valya, Fri Apr 18 13:36:04 2008 UTC

# Line 1 | Line 1
1 < ### RPM external java-jdk 1.5.0.p6
2 < ## BUILDIF [ $(uname) != Darwin ]
3 < %define downloadv %(echo %v | tr '.p' '_0')
1 > ### RPM external java-jdk 1.5.0_15
2 > ## BUILDIF [ "$(uname)" != "Darwin" ]
3  
4 < %if "%{cmsplatf}" == "slc3_ia32_gcc323"
4 > Provides: libasound.so.2
5 > Provides: libasound.so.2(ALSA_0.9)
6 > Provides: libjava_crw_demo_g.so
7 > Provides: libodbc.so
8 > Provides: libodbcinst.so
9 >
10 > %define downloadv %(echo %realversion | tr '.p' '_0')
11 >
12 > %define tmpArch %(echo %cmsplatf | cut -d_ -f 1,2)
13 >
14 > %if "%{tmpArch}" == "slc3_ia32"
15   %define downloadarch i586
16   %endif
17  
18 < %if "%{cmsplatf}" == "slc3_amd64_gcc344"
19 < %define downloadarch amd64
18 > # A hack? Probably won't work for slc4 but...
19 > %if "%{tmpArch}" == "slc4_ia32"
20 > %define downloadarch i586
21   %endif
22  
23 < %if "%{?downloadarch:set}" != "set"
24 < %error Unsupported architecture.
23 > %if "%{tmpArch}" == "slc3_amd64"
24 > %define downloadarch amd64
25   %endif
26  
27 < Source: http://eulisse.web.cern.ch/eulisse/jdk-%downloadv-linux-%downloadarch.bin
27 > Source0: http://cmsrep.cern.ch/cmssw/jdk-mirror/jdk-%downloadv-linux-i586.bin
28 > Source1: http://cmsrep.cern.ch/cmssw/jdk-mirror/jdk-%downloadv-linux-amd64.bin
29 >
30   %prep
31 + %if %(uname) != Darwin
32   ls
33 < %define javadir jdk%(echo %v| sed -e "s/.p/_0/")
33 > %define javadir jdk%(echo %realversion| sed -e "s/.p/_0/")
34   rm -rf %javadir
35   yes | sh %{_sourcedir}/jdk-%downloadv-linux-%downloadarch.bin
36   cd %javadir
37 + %endif
38   %build
39   %install
40 + %if %(uname) != Darwin
41   ls
42   cp -r %javadir/* %i
43 + %endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines