SPECS: java-sun.spec - amd64 fixes; rel 4

glen glen at pld-linux.org
Tue Jan 30 00:33:10 CET 2007


Author: glen                         Date: Mon Jan 29 23:33:10 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- amd64 fixes; rel 4

---- Files affected:
SPECS:
   java-sun.spec (1.170 -> 1.171) 

---- Diffs:

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.170 SPECS/java-sun.spec:1.171
--- SPECS/java-sun.spec:1.170	Tue Jan 30 00:29:08 2007
+++ SPECS/java-sun.spec	Tue Jan 30 00:33:05 2007
@@ -2,7 +2,6 @@
 # TODO:
 # - better way to choose preferred jvm (currently the symlinks are hardcoded)
 #   Maybe a package containing only the symlinks?
-# - unpackaged: /usr/share/man/man1/javaws.1.gz
 #
 %define		_src_ver	6
 %define		_dir_ver	%(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
@@ -10,7 +9,7 @@
 Summary(pl):	Sun JDK - środowisko programistyczne Javy dla Linuksa
 Name:		java-sun
 Version:	1.6.0
-Release:	3.5
+Release:	4
 License:	restricted, distributable
 Group:		Development/Languages/Java
 Source0:	http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
@@ -321,6 +320,11 @@
 	ln -sf ../jre/bin/$i $RPM_BUILD_ROOT%{javadir}/bin/$i
 done
 
+%ifarch %{x8664}
+# only manual available on this platform
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/javaws.1
+%endif
+
 %ifarch %{ix86}
 # copy _all_ plugin files (even those incompatible with PLD) --
 # license restriction
@@ -567,7 +571,6 @@
 %dir %{jredir}/lib/%{arch}
 %dir %{jredir}/lib/%{arch}/headless
 %dir %{jredir}/lib/%{arch}/jli
-%attr(755,root,root) %{jredir}/lib/%{arch}/client
 %attr(755,root,root) %{jredir}/lib/%{arch}/native_threads
 %attr(755,root,root) %{jredir}/lib/%{arch}/server
 %attr(755,root,root) %{jredir}/lib/%{arch}/jli/libjli.so
@@ -575,6 +578,7 @@
 %attr(755,root,root) %{jredir}/lib/%{arch}/lib[acdfhijmnrvz]*.so
 %exclude %{jredir}/lib/%{arch}/libjsoundalsa.so
 %ifarch %{ix86}
+%attr(755,root,root) %{jredir}/lib/%{arch}/client
 %attr(755,root,root) %{jredir}/lib/%{arch}/libsplashscreen.so
 %exclude %{jredir}/lib/%{arch}/libjavaplugin*.so
 %endif
@@ -771,6 +775,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.171  2007/01/29 23:33:05  glen
+- amd64 fixes; rel 4
+
 Revision 1.170  2007/01/29 23:29:08  glen
 - simplify
 - overwrite duplicate files with symlinks from -jre
================================================================

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



More information about the pld-cvs-commit mailing list