SPECS: java-sun.spec - fix amd64 build

arekm arekm at pld-linux.org
Sun Dec 17 17:14:54 CET 2006


Author: arekm                        Date: Sun Dec 17 16:14:54 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix amd64 build

---- Files affected:
SPECS:
   java-sun.spec (1.154 -> 1.155) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.154 SPECS/java-sun.spec:1.155
--- SPECS/java-sun.spec:1.154	Sun Dec 17 13:50:38 2006
+++ SPECS/java-sun.spec	Sun Dec 17 17:14:49 2006
@@ -10,7 +10,7 @@
 Summary(pl):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	%{_ver}
-Release:	0.2
+Release:	0.3
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
@@ -619,15 +619,17 @@
 %ifarch %{x8664}
 %dir %{jredir}/lib/amd64
 %attr(755,root,root) %dir %{jredir}/lib/amd64/headless
-#%attr(755,root,root) %{jredir}/lib/i386/client
+%attr(755,root,root) %{jredir}/lib/amd64/jli
 %attr(755,root,root) %{jredir}/lib/amd64/native_threads
 %attr(755,root,root) %{jredir}/lib/amd64/server
 %{jredir}/lib/amd64/jvm.cfg
 %attr(755,root,root) %{jredir}/lib/amd64/lib[acdfhijmnrvz]*.so
 %exclude %{jredir}/lib/amd64/libjsoundalsa.so
 %endif
+%ifnarch %{x8664}
 %{jredir}/lib/deploy
 %{jredir}/lib/desktop
+%endif
 %{jredir}/lib/im
 %{jredir}/lib/images
 %attr(755,root,root) %{jredir}/lib/jexec
@@ -671,7 +673,6 @@
 %attr(755,root,root) %{jredir}/lib/i386/libunpack.so
 %endif
 %ifarch %{x8664}
-%attr(755,root,root) %{jredir}/lib/amd64/gtkhelper
 %attr(755,root,root) %{jredir}/lib/amd64/headless/libmawt.so
 %attr(755,root,root) %{jredir}/lib/amd64/libsaproc.so
 %attr(755,root,root) %{jredir}/lib/amd64/libunpack.so
@@ -728,7 +729,7 @@
 %dir %{jredir}/lib/amd64
 %attr(755,root,root) %dir %{jredir}/lib/amd64/xawt
 %attr(755,root,root) %dir %{jredir}/lib/amd64/motif21
-%attr(755,root,root) %{jredir}/lib/amd64/awt_robot
+%attr(755,root,root) %{jredir}/lib/amd64/libsplashscreen.so
 %endif
 %ifarch %{ix86}
 %{jvmjardir}/javaws.jar
@@ -840,6 +841,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.155  2006/12/17 16:14:49  arekm
+- fix amd64 build
+
 Revision 1.154  2006/12/17 12:50:38  hawk
 - fixed unpackaged files
 - update finished, seems to work (tested JRE, browser plugin and compiler)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.154&r2=1.155&f=u



More information about the pld-cvs-commit mailing list