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.4 by eulisse, Thu Jun 15 13:19:35 2006 UTC vs.
Revision 1.17 by valya, Tue Feb 10 03:39:03 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines