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.5 by eulisse, Mon Jul 3 17:54:28 2006 UTC vs.
Revision 1.12 by dlange, Thu Sep 6 20:55:14 2007 UTC

# Line 1 | Line 1
1 < ### RPM external java-jdk 1.5.0.p6
1 > ### RPM external java-jdk 1.5.0.p6-CMS8
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 15 | Line 15 | Provides: libodbcinst.so
15   %define downloadarch i586
16   %endif
17  
18 + # A hack? Probably won't work for slc4 but...
19 + %if "%{tmpArch}" == "slc4_ia32"
20 + %define downloadarch i586
21 + %endif
22 +
23   %if "%{tmpArch}" == "slc3_amd64"
24   %define downloadarch amd64
25   %endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines