packages: icedtea6/icedtea6.spec - some files excluded on i486 - jre(X11) a...

[jajcus]

Author: jajcus                       Date: Fri Apr 16 10:04:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- some files excluded on i486
- jre(X11) and jre(fontconfig) virtual provides

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.30 packages/icedtea6/icedtea6.spec:1.31
--- packages/icedtea6/icedtea6.spec:1.30	Fri Apr 16 11:08:53 2010
+++ packages/icedtea6/icedtea6.spec	Fri Apr 16 12:04:01 2010
@@ -193,6 +193,7 @@
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
 Requires:	%{name}-jre-freetype = %{version}-%{release}
+Provides:	jre(X11)
 
 %description jre-X11
 X11 support for OpenJDK runtime environment built using free software
@@ -221,6 +222,7 @@
 Summary(pl.UTF-8):	IcedTea6 OpenJDK - środowisko uruchomieniowe - obsługa fontów
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-base = %{version}-%{release}
+Provides:	jre(fontmanager)
 
 %description jre-freetype
 Font handling library for OpenJDK runtime environment built using free
@@ -572,7 +574,9 @@
 %{dstdir}/lib/jconsole.jar
 %attr(755,root,root) %{dstdir}/lib/jexec
 %{dstdir}/lib/orb.idl
+%ifnarch i486
 %{dstdir}/lib/sa-jdi.jar
+%endif
 %{dstdir}/lib/tools.jar
 
 %files jre
@@ -651,7 +655,7 @@
 %{jredir}/lib/cmm
 %{jredir}/lib/ext
 %dir %{jredir}/lib/%{jre_arch}
-%ifnarch x86_64
+%ifnarch x86_64 i486
 %dir %{jredir}/lib/%{jre_arch}/client
 %{jredir}/lib/%{jre_arch}/client/Xusage.txt
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/client/*.so
@@ -690,7 +694,9 @@
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libnio.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libnpt.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/librmi.so
+%ifnarch i486
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libsaproc.so
+%endif
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libunpack.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libverify.so
 %attr(755,root,root) %{jredir}/lib/%{jre_arch}/libzip.so
@@ -782,6 +788,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2010/04/16 10:04:01  jajcus
+- some files excluded on i486
+- jre(X11) and jre(fontconfig) virtual provides
+
 Revision 1.30  2010/04/16 09:08:53  jajcus
 - removed the 'jar' duplicate in -jdk package
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.30&r2=1.31&f=u