ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CMSDIST/java-jdk.spec

Comparing COMP/CMSDIST/java-jdk.spec (file contents):
Revision 1.5 by eulisse, Mon Jul 3 17:54:28 2006 UTC vs.
Revision 1.14 by elmer, Tue Nov 13 14:13:54 2007 UTC

#	Line 1 | Line 1
1	<	### RPM external java-jdk 1.5.0.p6
1	>	### RPM external java-jdk 1.5.0.p6-CMS18
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
#	Line 25 | Line 30 | Source1: http://eulisse.web.cern.ch/euli
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

Diff Legend

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